geforkt von Mirrors/Paper
32 Zeilen
1.7 KiB
Diff
32 Zeilen
1.7 KiB
Diff
--- a/net/minecraft/server/TileEntityBeehive.java
|
|
+++ b/net/minecraft/server/TileEntityBeehive.java
|
|
@@ -161,6 +161,7 @@
|
|
if (!entity.getEntityType().a(TagsEntity.BEEHIVE_INHABITORS)) {
|
|
return false;
|
|
} else {
|
|
+ if (!this.world.addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BEEHIVE)) return false; // CraftBukkit - SpawnReason, moved from below
|
|
if (entity instanceof EntityBee) {
|
|
EntityBee entitybee = (EntityBee) entity;
|
|
|
|
@@ -194,7 +195,7 @@
|
|
BlockPosition blockposition2 = this.getPosition();
|
|
|
|
this.world.playSound((EntityHuman) null, (double) blockposition2.getX(), (double) blockposition2.getY(), (double) blockposition2.getZ(), SoundEffects.BLOCK_BEEHIVE_EXIT, SoundCategory.BLOCKS, 1.0F, 1.0F);
|
|
- return this.world.addEntity(entity);
|
|
+ return true; // return this.world.addEntity(entity); // CraftBukkit - moved up
|
|
}
|
|
} else {
|
|
return false;
|
|
@@ -221,6 +222,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++;
|
|
}
|