diff options
| author | md_5 <git@md-5.net> | 2015-05-31 11:40:23 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-05-31 11:40:23 +1000 |
| commit | 6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2 (patch) | |
| tree | 3a929555587f6cd59a7320ef77ffc9ebf5a3f3dc | |
| parent | 21681b37209177769de2e0a5983ab8263326ae27 (diff) | |
| download | craftbukkit-6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2.tar craftbukkit-6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2.tar.gz craftbukkit-6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2.tar.lz craftbukkit-6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2.tar.xz craftbukkit-6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2.zip | |
Don't need to special case certain monster spawn eggs as Mojang has long since fixed those issues.
| -rw-r--r-- | nms-patches/ItemMonsterEgg.patch | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/nms-patches/ItemMonsterEgg.patch b/nms-patches/ItemMonsterEgg.patch index 46570640..e4236317 100644 --- a/nms-patches/ItemMonsterEgg.patch +++ b/nms-patches/ItemMonsterEgg.patch @@ -1,16 +1,6 @@ --- 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 @@ +@@ -109,6 +109,12 @@ } public static Entity a(World world, int i, double d0, double d1, double d2) { @@ -23,7 +13,7 @@ if (!EntityTypes.eggInfo.containsKey(Integer.valueOf(i))) { return null; } else { -@@ -123,8 +130,13 @@ +@@ -123,8 +129,13 @@ entityinsentient.aK = entityinsentient.yaw; entityinsentient.aI = entityinsentient.yaw; entityinsentient.prepare(world.E(new BlockPosition(entityinsentient)), (GroupDataEntity) null); |