diff options
| author | Jake Potrebic <[email protected]> | 2024-05-30 13:17:16 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-30 13:17:16 -0700 |
| commit | a47e11d464d84aca537687748aafe32c08567801 (patch) | |
| tree | 3d8db87b4fed8463d840c55ef46c8f7c4aff1444 /patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch | |
| parent | 06e69c8991b8c5022a319e4415ebd7822b5d1fb8 (diff) | |
| download | Paper-a47e11d464d84aca537687748aafe32c08567801.tar.gz Paper-a47e11d464d84aca537687748aafe32c08567801.zip | |
fix knockback events (#10831)
* fix knockback events
* squash
* handle cancelled event for explosions
Diffstat (limited to 'patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch')
| -rw-r--r-- | patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch index bb1077fa6c..35e3cc3234 100644 --- a/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch +++ b/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Revert to vanilla handling of LivingEntity#actuallyHurt diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0580d34ee23bba9709fd8dac78582f4f1cf0a71c..b68ef1439e72c61828bb15fe82da11c9057bdb30 100644 +index 3276ea59999e76c2a2b0c82b96e0e91865e96a98..6b447cdf5b14deb26e0454f9f731724c89f2d498 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2226,7 +2226,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2216,7 +2216,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } // CraftBukkit start @@ -17,7 +17,7 @@ index 0580d34ee23bba9709fd8dac78582f4f1cf0a71c..b68ef1439e72c61828bb15fe82da11c9 if (!this.isInvulnerableTo(damagesource)) { final boolean human = this instanceof net.minecraft.world.entity.player.Player; float originalDamage = f; -@@ -2398,12 +2398,12 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2388,12 +2388,12 @@ public abstract class LivingEntity extends Entity implements Attackable { return true; } else { |