diff options
Diffstat (limited to 'patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch')
| -rw-r--r-- | patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch index 0640edf4f3..c2f72432f5 100644 --- a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch @@ -44,10 +44,10 @@ index ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb..e382a29b441b656f35bc24cb90f95cb4 } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) { return false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 914c6499eb94665f0e3c4654dd05fc10d93f87d4..e38f0659836be4bebff06e8d8e7848abdcbda455 100644 +index 81838056cacb9f2fd2d3c05b125461ac3013e82b..636bef0624f71dea27cbab261c3072fdf73fbf4b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3534,7 +3534,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3540,7 +3540,7 @@ public abstract class LivingEntity extends Entity implements Attackable { return; } // Paper end - don't run getEntities if we're not going to use its result @@ -56,7 +56,7 @@ index 914c6499eb94665f0e3c4654dd05fc10d93f87d4..e38f0659836be4bebff06e8d8e7848ab if (!list.isEmpty()) { // Paper - don't run getEntities if we're not going to use its result; moved up -@@ -3724,9 +3724,16 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3730,9 +3730,16 @@ public abstract class LivingEntity extends Entity implements Attackable { return !this.isRemoved() && this.collides; // CraftBukkit } |