aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff options
context:
space:
mode:
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.patch6
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 {