mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-19 18:31:18 +02:00
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
--- a/net/minecraft/server/ItemMonsterEgg.java
|
|
+++ b/net/minecraft/server/ItemMonsterEgg.java
|
|
@@ -130,7 +130,11 @@
|
|
}
|
|
|
|
@Nullable
|
|
- public static Entity a(World world, @Nullable String s, double d0, double d1, double d2) {
|
|
+ public static Entity a(World world, @Nullable String s, double d0, double d1, double d2) { // CraftBukkit start - delegate to spawnCreature
|
|
+ return spawnCreature(world, s, d0, d1, d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
|
|
+ }
|
|
+
|
|
+ public static Entity spawnCreature(World world, String s, double d0, double d1, double d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
|
|
if (s != null && EntityTypes.eggInfo.containsKey(s)) {
|
|
Entity entity = null;
|
|
|
|
@@ -143,8 +147,13 @@
|
|
entityinsentient.aP = entityinsentient.yaw;
|
|
entityinsentient.aN = entityinsentient.yaw;
|
|
entityinsentient.prepare(world.D(new BlockPosition(entityinsentient)), (GroupDataEntity) null);
|
|
- world.addEntity(entity);
|
|
- entityinsentient.D();
|
|
+ // CraftBukkit start - don't return an entity when CreatureSpawnEvent is canceled
|
|
+ if (!world.addEntity(entity, spawnReason)) {
|
|
+ entity = null;
|
|
+ } else {
|
|
+ entityinsentient.D();
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|