diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-01-15 09:45:16 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-01-15 10:01:49 +0000 |
commit | 25050e38eb02c93b32fc9b1eaf2de82992a7ff3a (patch) | |
tree | 1fe352e8233e004eb5a51191c55c4b05f8a4211d /src/main/java/net/minecraft/server/ItemMonsterEgg.java | |
parent | 390a79e098903371a271f9bc68fe711915caf9e7 (diff) | |
download | craftbukkit-25050e38eb02c93b32fc9b1eaf2de82992a7ff3a.tar craftbukkit-25050e38eb02c93b32fc9b1eaf2de82992a7ff3a.tar.gz craftbukkit-25050e38eb02c93b32fc9b1eaf2de82992a7ff3a.tar.lz craftbukkit-25050e38eb02c93b32fc9b1eaf2de82992a7ff3a.tar.xz craftbukkit-25050e38eb02c93b32fc9b1eaf2de82992a7ff3a.zip |
Disallow people spawning invalid entities using monster eggs. Thanks to md-5 for the PR.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemMonsterEgg.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemMonsterEgg.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java index c4bd8644..58bf9b7b 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -9,7 +9,7 @@ public class ItemMonsterEgg extends Item { } public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) { - if (world.isStatic) { + if (world.isStatic || itemstack.getData() == 48 || itemstack.getData() == 49 || itemstack.getData() == 63) { // CraftBukkit return true; } else { i += Facing.b[l]; @@ -17,7 +17,7 @@ public class ItemMonsterEgg extends Item { k += Facing.d[l]; Entity entity = EntityTypes.a(itemstack.getData(), world); - if (entity != null) { + if (entity != null && entity instanceof EntityLiving) { // CraftBukkit if (!entityhuman.abilities.canInstantlyBuild) { --itemstack.count; } @@ -29,4 +29,4 @@ public class ItemMonsterEgg extends Item { return true; } } -} +}
\ No newline at end of file |