Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

Don't decrement ItemStack when CreatureSpawnEvent is canceled - addresses SPIGOT-87

Browse Source
This commit is contained in:
DemonWav 2014-12-13 23:59:49 -06:00 committed by Thinkofdeath
parent 28f37a113c
commit 55e592e542
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nms-patches/ItemMonsterEgg.patch
View File

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ItemMonsterEgg.java 2014-12-03 10:52:09.804159084 +0000 --- ../work/decompile-8eb82bde/net/minecraft/server/ItemMonsterEgg.java 2014-12-15 13:53:30.086979118 +0000
+++ src/main/java/net/minecraft/server/ItemMonsterEgg.java 2014-12-03 10:51:53.380159449 +0000 +++ src/main/java/net/minecraft/server/ItemMonsterEgg.java 2014-12-15 13:53:30.086979118 +0000
@@ -19,7 +19,8 @@ @@ -19,7 +19,8 @@
} }
@ -23,12 +23,19 @@
if (!EntityTypes.eggInfo.containsKey(Integer.valueOf(i))) { if (!EntityTypes.eggInfo.containsKey(Integer.valueOf(i))) {
return null; return null;
} else { } else {
@@ -123,7 +130,7 @@ @@ -123,8 +130,13 @@
entityinsentient.aI = entityinsentient.yaw; entityinsentient.aI = entityinsentient.yaw;
entityinsentient.aG = entityinsentient.yaw; entityinsentient.aG = entityinsentient.yaw;
entityinsentient.prepare(world.E(new BlockPosition(entityinsentient)), (GroupDataEntity) null); entityinsentient.prepare(world.E(new BlockPosition(entityinsentient)), (GroupDataEntity) null);
- world.addEntity(entity); - world.addEntity(entity);
+ world.addEntity(entity, spawnReason); // CraftBukkit - entityinsentient.x();
entityinsentient.x(); + // CraftBukkit start - don't return an entity when CreatureSpawnEvent is canceled
+ if (!world.addEntity(entity, spawnReason)) {
+ entity = null;
+ } else {
+ entityinsentient.x();
+ }
+ // CraftBukkit end
} }
} }