Spigot / CraftBukkit / 062680a8264

Commits

md_5 authored 062680a8264 23 Dec 2019

SPIGOT-5467: Calm down bees that cannot exit hive

Modified

-1
+--- a/net/minecraft/server/TileEntityBeehive.java
-2
++++ b/net/minecraft/server/TileEntityBeehive.java
-3
+@@ -194,7 +194,7 @@
-4
+                         BlockPosition blockposition2 = this.getPosition();
-5
-6
+                         this.world.playSound((EntityHuman) null, (double) blockposition2.getX(), (double) blockposition2.getY(), (double) blockposition2.getZ(), SoundEffects.BLOCK_BEEHIVE_EXIT, SoundCategory.BLOCKS, 1.0F, 1.0F);
-7
+-                        return this.world.addEntity(entity);
-8
++                        return this.world.addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BEEHIVE); // CraftBukkit
-9
+                     }
-10
+                 } else {
-11
+                     return false;
-+
+@@ -221,6 +221,11 @@
-+
+                 if (this.a(iblockdata, nbttagcompound, (List) null, tileentitybeehive_releasestatus)) {
-+
+                     iterator.remove();
-+
+                 }
-+
++                // CraftBukkit start
-+
++                else {
-+
++                    tileentitybeehive_a.b = tileentitybeehive_a.c / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable
-+
++                }
-+
++                // CraftBukkit end
-+
+             } else {
-+
+                 tileentitybeehive_a.b++;
-+
+             }