Honor EntityAgeable.ageLock

2018-09-23 20:59:53 -05:00
parent 4bea989f34
commit 46109028f9
2 changed files with 27 additions and 3 deletions
--- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
@@ -251,3 +251,19 @@
 
             Objects.requireNonNull(nbttagcompound);
             list.forEach(nbttagcompound::remove);
+@@ -391,6 +442,7 @@
+         }
+ 
+         private static void setBeeReleaseData(int ticksInHive, Bee beeEntity) {
+            if (!beeEntity.ageLocked) { // Paper - Honor ageLock
+             int j = beeEntity.getAge();
+ 
+             if (j < 0) {
+@@ -400,6 +452,7 @@
+             }
+ 
+             beeEntity.setInLoveTime(Math.max(0, beeEntity.getInLoveTime() - ticksInHive));
+            } // Paper - Honor ageLock
+         }
+     }
+