diff options
| author | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
| commit | a74d9bf629ab2d502831fb36a251cdac0ab30522 (patch) | |
| tree | 44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch | |
| parent | 6723f5498616da919762c68978e13c518943ef40 (diff) | |
| parent | 70b0e844767131681400b3dbace06c2dea13f87c (diff) | |
| download | Paper-chore/terminal.tar.gz Paper-chore/terminal.zip | |
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch')
| -rw-r--r-- | patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch index e4afda05dd..4ebe570740 100644 --- a/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch +++ b/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch @@ -23,10 +23,10 @@ index 2ebbf7954dc5e0d6c9d53327d05b725eec310086..c5bd2e90ad74ba08910f65a2e07b6f76 return !this.getResponse(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8ec08a30875816d2b8258b56ee37a4938aed50fb..c8c52514777a97b35bd4fb2ac84565f07c8921d7 100644 +index 7ad469bf4b88f9e33ad4aaebe18e41d25769444e..ffc0fcd7c2075b44585bd754494f2f7c07788f47 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2359,7 +2359,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2388,7 +2388,7 @@ public abstract class LivingEntity extends Entity implements Attackable { // Duplicate triggers if blocking if (event.getDamage(DamageModifier.BLOCKING) < 0) { if (this instanceof ServerPlayer) { @@ -35,7 +35,7 @@ index 8ec08a30875816d2b8258b56ee37a4938aed50fb..c8c52514777a97b35bd4fb2ac84565f0 f2 = (float) -event.getDamage(DamageModifier.BLOCKING); if (f2 > 0.0F && f2 < 3.4028235E37F) { ((ServerPlayer) this).awardStat(Stats.DAMAGE_BLOCKED_BY_SHIELD, Math.round(originalDamage * 10.0F)); -@@ -2367,7 +2367,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2396,7 +2396,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } if (damagesource.getEntity() instanceof ServerPlayer) { |