Skip to content

Add getLastDamageTime method to Combat Tracker API #13854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcmdev wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Open

Add getLastDamageTime method to Combat Tracker API #13854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-data/paper.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public net.minecraft.world.SimpleContainer items
public net.minecraft.world.damagesource.CombatTracker entries
public net.minecraft.world.damagesource.CombatTracker getMostSignificantFall()Lnet/minecraft/world/damagesource/CombatEntry;
public net.minecraft.world.damagesource.CombatTracker inCombat
public net.minecraft.world.damagesource.CombatTracker lastDamageTime
public net.minecraft.world.damagesource.CombatTracker mob
public net.minecraft.world.damagesource.CombatTracker takingDamage
public net.minecraft.world.damagesource.DamageSource <init>(Lnet/minecraft/core/Holder;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;)V
Expand Down
7 changes: 7 additions & 0 deletions paper-api/src/main/java/io/papermc/paper/world/damagesource/CombatTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,11 @@ public interface CombatTracker {
* @return the fall location type
*/
@Nullable FallLocationType calculateFallLocationType();

/**
* Returns time since last damage in ticks
*
* @return ticks since last damage
*/
int getLastDamageTime();
}
5 changes: 5 additions & 0 deletions ...r-server/src/main/java/io/papermc/paper/world/damagesource/PaperCombatTrackerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ public FallLocationType calculateFallLocationType() {
return Optionull.map(fallLocation, PaperCombatTrackerWrapper::minecraftToPaper);
}

@Override
public int getLastDamageTime() {
return this.handle.mob.tickCount - this.handle.lastDamageTime;
}

private static final BiMap<FallLocation, FallLocationType> FALL_LOCATION_MAPPING = Util.make(() -> {
final BiMap<FallLocation, FallLocationType> map = HashBiMap.create(8);
map.put(FallLocation.GENERIC, FallLocationType.GENERIC);
Expand Down
Loading