Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

Don't need to special case certain monster spawn eggs as Mojang has long since fixed those issues.

Browse Source
This commit is contained in:
md_5 2015-05-31 11:40:23 +10:00
parent 21681b3720
commit 6fe71f4c7f
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nms-patches/ItemMonsterEgg.patch
View File

@ -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);