summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemMonsterEgg.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ItemMonsterEgg.patch')
-rw-r--r--nms-patches/ItemMonsterEgg.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/ItemMonsterEgg.patch b/nms-patches/ItemMonsterEgg.patch
index 39d62af2..8685820b 100644
--- a/nms-patches/ItemMonsterEgg.patch
+++ b/nms-patches/ItemMonsterEgg.patch
@@ -1,12 +1,12 @@
---- ../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-15 13:53:30.086979118 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/ItemMonsterEgg.java 2015-02-26 22:40:22.843608137 +0000
++++ src/main/java/net/minecraft/server/ItemMonsterEgg.java 2015-02-26 22:40:22.843608137 +0000
@@ -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.isStatic) {
+- if (world.isClientSide) {
+ // CraftBukkit - check ItemStack data
-+ if (world.isStatic || itemstack.getData() == 48 || itemstack.getData() == 49 || itemstack.getData() == 63 || itemstack.getData() == 64) {
++ 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;
@@ -24,8 +24,8 @@
return null;
} else {
@@ -123,8 +130,13 @@
+ entityinsentient.aK = entityinsentient.yaw;
entityinsentient.aI = entityinsentient.yaw;
- entityinsentient.aG = entityinsentient.yaw;
entityinsentient.prepare(world.E(new BlockPosition(entityinsentient)), (GroupDataEntity) null);
- world.addEntity(entity);
- entityinsentient.x();