Paper/nms-patches/ItemMonsterEgg.patch

31 lines
1.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ItemMonsterEgg.java
+++ b/net/minecraft/server/ItemMonsterEgg.java
2016-12-20 21:00:00 +01:00
@@ -152,6 +152,11 @@
2016-05-10 13:47:39 +02:00
@Nullable
2016-11-17 02:41:03 +01:00
public static Entity a(World world, @Nullable MinecraftKey minecraftkey, double d0, double d1, double d2) {
+ return spawnCreature(world, minecraftkey, d0, d1, d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
+ }
+
2016-11-17 02:41:03 +01:00
+ @Nullable
+ public static Entity spawnCreature(World world, @Nullable MinecraftKey minecraftkey, double d0, double d1, double d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
if (minecraftkey != null && EntityTypes.eggInfo.containsKey(minecraftkey)) {
2016-02-29 22:32:46 +01:00
Entity entity = null;
2016-12-20 21:00:00 +01:00
@@ -164,8 +169,13 @@
2016-11-17 02:41:03 +01:00
entityinsentient.aP = entityinsentient.yaw;
entityinsentient.aN = entityinsentient.yaw;
2016-02-29 22:32:46 +01:00
entityinsentient.prepare(world.D(new BlockPosition(entityinsentient)), (GroupDataEntity) null);
2014-12-03 11:52:18 +01:00
- world.addEntity(entity);
2016-02-29 22:32:46 +01:00
- entityinsentient.D();
+ // CraftBukkit start - don't return an entity when CreatureSpawnEvent is canceled
+ if (!world.addEntity(entity, spawnReason)) {
+ entity = null;
+ } else {
2016-02-29 22:32:46 +01:00
+ entityinsentient.D();
+ }
+ // CraftBukkit end
2014-12-03 11:52:18 +01:00
}
}