Merge pull request #2587 from diesieben07/spawn_egg_fix

Fix mod spawn eggs and EntityList.func_188429_b
2016-03-21 19:42:59 -07:00 · 2016-03-21 19:42:59 -07:00 · 2a1c98048e
commit 2a1c98048e
parent ac44fe298a 313d7bbc11
1 changed files with 10 additions and 0 deletions
--- a/patches/minecraft/net/minecraft/entity/EntityList.java.patch
+++ b/patches/minecraft/net/minecraft/entity/EntityList.java.patch
@ -38,3 +38,13 @@
         }
         else
         {
+@@ -202,7 +214,8 @@
+ 
+     public static Entity func_188429_b(String p_188429_0_, World p_188429_1_)
+     {
+-        return func_75616_a(func_180122_a(p_188429_0_), p_188429_1_);
+        Entity e = func_75620_a(p_188429_0_, p_188429_1_); // Forge: Support entities without global ID
+        return e == null ? func_75620_a("Pig", p_188429_1_) : e;
+     }
+ 
+     public static int func_75619_a(Entity p_75619_0_)