diff options
| author | Jake Potrebic <[email protected]> | 2024-05-30 12:51:57 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-05-30 12:51:57 -0700 |
| commit | 561fda88a86a274ecc7725c95a31da762f6120b2 (patch) | |
| tree | 87bb2efbcb59d6c2ad6759b48604c20b814407f3 /patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch | |
| parent | 4df603b4da47ecd9a0085e82e81b6a425b888d8a (diff) | |
| download | Paper-561fda88a86a274ecc7725c95a31da762f6120b2.tar.gz Paper-561fda88a86a274ecc7725c95a31da762f6120b2.zip | |
squash
Diffstat (limited to 'patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch')
| -rw-r--r-- | patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch index f9788eba39..a581aee283 100644 --- a/patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0a51ea55a6b768d71161c4492664a61ec1e5df15..0328738d613358a9042b1d12de511f212db68244 100644 +index 4187fc3722b7e27ccf4fcb2617c00c3af8241f9f..f7964a9ef04d35b5bf46ff18071ef22f53b9a3b5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2010,6 +2010,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -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 33658a45d9f61640ab2b56be3fecb5b2552bca84..70f34d741eeafd54fcd2f5aaf9d059ba0f96e60a 100644 +index 34e89959a1ec8d391709373e02e7da928ca69770..784aea6bddd4f8c71733549d0d7b7643becde9de 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3540,7 +3540,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3530,7 +3530,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 33658a45d9f61640ab2b56be3fecb5b2552bca84..70f34d741eeafd54fcd2f5aaf9d059ba if (!list.isEmpty()) { // Paper - don't run getEntities if we're not going to use its result; moved up -@@ -3730,9 +3730,16 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3720,9 +3720,16 @@ public abstract class LivingEntity extends Entity implements Attackable { return !this.isRemoved() && this.collides; // CraftBukkit } |