From 8940b13512c3984f77f3c277f085b36fbf83e810 Mon Sep 17 00:00:00 2001 From: iChun Date: Tue, 18 Sep 2012 21:37:48 +0800 Subject: [PATCH 1/3] Fix pick block key giving invalid spawn eggs --- patches/common/net/minecraft/src/Entity.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/common/net/minecraft/src/Entity.java.patch b/patches/common/net/minecraft/src/Entity.java.patch index c96b70d865..bdc70115c7 100644 --- a/patches/common/net/minecraft/src/Entity.java.patch +++ b/patches/common/net/minecraft/src/Entity.java.patch @@ -119,7 +119,7 @@ + else + { + int id = EntityList.getEntityID(this); -+ if (id > 0 || EntityList.entityEggs.containsKey(id)) ++ if (!(id <= 0 || !EntityList.entityEggs.containsKey(id))) + { + return new ItemStack(Item.monsterPlacer, 1, id); + } From 3188218a373b5255102b9ad6a74b9b725a7defb2 Mon Sep 17 00:00:00 2001 From: iChun Date: Tue, 18 Sep 2012 22:53:28 +0800 Subject: [PATCH 2/3] Logic derped --- patches/common/net/minecraft/src/Entity.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/common/net/minecraft/src/Entity.java.patch b/patches/common/net/minecraft/src/Entity.java.patch index bdc70115c7..32214e6f9d 100644 --- a/patches/common/net/minecraft/src/Entity.java.patch +++ b/patches/common/net/minecraft/src/Entity.java.patch @@ -119,7 +119,7 @@ + else + { + int id = EntityList.getEntityID(this); -+ if (!(id <= 0 || !EntityList.entityEggs.containsKey(id))) ++ if (id > 0 && !EntityList.entityEggs.containsKey(id)) + { + return new ItemStack(Item.monsterPlacer, 1, id); + } From cbf88adc98df8ab2bb83a2566ab1ff93bf352aa8 Mon Sep 17 00:00:00 2001 From: iChun Date: Tue, 18 Sep 2012 22:55:11 +0800 Subject: [PATCH 3/3] Logic derp (again) --- patches/common/net/minecraft/src/Entity.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/common/net/minecraft/src/Entity.java.patch b/patches/common/net/minecraft/src/Entity.java.patch index 32214e6f9d..fd46d31525 100644 --- a/patches/common/net/minecraft/src/Entity.java.patch +++ b/patches/common/net/minecraft/src/Entity.java.patch @@ -119,7 +119,7 @@ + else + { + int id = EntityList.getEntityID(this); -+ if (id > 0 && !EntityList.entityEggs.containsKey(id)) ++ if (id > 0 && EntityList.entityEggs.containsKey(id)) + { + return new ItemStack(Item.monsterPlacer, 1, id); + }