mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
41 lines
2 KiB
Diff
41 lines
2 KiB
Diff
--- a/net/minecraft/server/ItemMonsterEgg.java
|
|
+++ b/net/minecraft/server/ItemMonsterEgg.java
|
|
@@ -19,7 +19,8 @@
|
|
}
|
|
|
|
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, BlockPosition blockposition, EnumDirection enumdirection, float f, float f1, float f2) {
|
|
- if (world.isClientSide) {
|
|
+ // CraftBukkit - check ItemStack data
|
|
+ if (world.isClientSide || itemstack.getData() == 48 || itemstack.getData() == 49 || itemstack.getData() == 63 || itemstack.getData() == 64) {
|
|
return true;
|
|
} else if (!entityhuman.a(blockposition.shift(enumdirection), enumdirection, itemstack)) {
|
|
return false;
|
|
@@ -109,6 +110,12 @@
|
|
}
|
|
|
|
public static Entity a(World world, int i, double d0, double d1, double d2) {
|
|
+ // CraftBukkit start - delegate to spawnCreature
|
|
+ return spawnCreature(world, i, d0, d1, d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
|
|
+ }
|
|
+
|
|
+ public static Entity spawnCreature(World world, int i, double d0, double d1, double d2, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
|
|
+ // CraftBukkit end
|
|
if (!EntityTypes.eggInfo.containsKey(Integer.valueOf(i))) {
|
|
return null;
|
|
} else {
|
|
@@ -123,8 +130,13 @@
|
|
entityinsentient.aK = entityinsentient.yaw;
|
|
entityinsentient.aI = entityinsentient.yaw;
|
|
entityinsentient.prepare(world.E(new BlockPosition(entityinsentient)), (GroupDataEntity) null);
|
|
- world.addEntity(entity);
|
|
- 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
|
|
}
|
|
}
|
|
|