OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-11 17:31:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5467: Don't play sound or increase honey level if bee leaving hive is cancelled

Browse source
This commit is contained in:
BlackHole 2019-12-23 14:25:03 +01:00 committed by md_5
parent 7d677e7b13
commit 297ff4000e
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nms-patches/TileEntityBeehive.patch
View file

@ -1,15 +1,23 @@
--- a/net/minecraft/server/TileEntityBeehive.java --- a/net/minecraft/server/TileEntityBeehive.java
+++ b/net/minecraft/server/TileEntityBeehive.java +++ b/net/minecraft/server/TileEntityBeehive.java
@@ -194,7 +194,7 @@ @@ -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(); 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); 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 this.world.addEntity(entity);
+ return this.world.addEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BEEHIVE); // CraftBukkit + return true; // return this.world.addEntity(entity); // CraftBukkit - moved up
} }
} else { } else {
return false; return false;
@@ -221,6 +221,11 @@ @@ -221,6 +222,11 @@
if (this.a(iblockdata, nbttagcompound, (List) null, tileentitybeehive_releasestatus)) { if (this.a(iblockdata, nbttagcompound, (List) null, tileentitybeehive_releasestatus)) {
iterator.remove(); iterator.remove();
} }