diff options
Diffstat (limited to 'patches/server/0248-Honor-EntityAgeable.ageLock.patch')
-rw-r--r-- | patches/server/0248-Honor-EntityAgeable.ageLock.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/server/0248-Honor-EntityAgeable.ageLock.patch b/patches/server/0248-Honor-EntityAgeable.ageLock.patch new file mode 100644 index 0000000000..1522ccc882 --- /dev/null +++ b/patches/server/0248-Honor-EntityAgeable.ageLock.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath <[email protected]> +Date: Sun, 23 Sep 2018 20:59:53 -0500 +Subject: [PATCH] Honor EntityAgeable.ageLock + + +diff --git a/src/main/java/net/minecraft/world/entity/AgeableMob.java b/src/main/java/net/minecraft/world/entity/AgeableMob.java +index f07cf6d91e0cbad80c3c630c0d505820e701ce81..3dc3609d13a7b823d15384d1c385b68eeb933d26 100644 +--- a/src/main/java/net/minecraft/world/entity/AgeableMob.java ++++ b/src/main/java/net/minecraft/world/entity/AgeableMob.java +@@ -85,6 +85,7 @@ public abstract class AgeableMob extends PathfinderMob { + } + + public void ageUp(int age, boolean overGrow) { ++ if (this.ageLocked) return; // Paper - Honor ageLock + int j = this.getAge(); + int k = j; + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +index 4ee7a4e5637fe36eb50e8ec9186d72d1253bfd98..b345403cdf5b2828f99708fef65136594a3331c3 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +@@ -446,6 +446,7 @@ public class BeehiveBlockEntity extends BlockEntity { + } + + private static void setBeeReleaseData(int ticksInHive, Bee beeEntity) { ++ if (!beeEntity.ageLocked) { // Paper - Honor ageLock + int j = beeEntity.getAge(); + + if (j < 0) { +@@ -455,6 +456,7 @@ public class BeehiveBlockEntity extends BlockEntity { + } + + beeEntity.setInLoveTime(Math.max(0, beeEntity.getInLoveTime() - ticksInHive)); ++ } // Paper - Honor ageLock + } + } + |