From 385159c25eda89302f5eebcba177560fef8de529 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Tue, 22 Sep 2015 19:53:34 +0200 Subject: [PATCH] Fix dispenser action for modded spawn eggs --- .../minecraft/net/minecraft/init/Bootstrap.java.patch | 9 +++++++++ .../net/minecraft/item/ItemMonsterPlacer.java.patch | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.java.patch b/patches/minecraft/net/minecraft/init/Bootstrap.java.patch index 6af9211745..68b643c961 100644 --- a/patches/minecraft/net/minecraft/init/Bootstrap.java.patch +++ b/patches/minecraft/net/minecraft/init/Bootstrap.java.patch @@ -8,6 +8,15 @@ static void func_151353_a() { BlockDispenser.field_149943_a.func_82595_a(Items.field_151032_g, new BehaviorProjectileDispense() +@@ -144,7 +145,7 @@ + double d0 = p_82487_1_.func_82615_a() + (double)enumfacing.func_82601_c(); + double d1 = (double)((float)p_82487_1_.func_180699_d().func_177956_o() + 0.2F); + double d2 = p_82487_1_.func_82616_c() + (double)enumfacing.func_82599_e(); +- Entity entity = ItemMonsterPlacer.func_77840_a(p_82487_1_.func_82618_k(), p_82487_2_.func_77960_j(), d0, d1, d2); ++ Entity entity = ItemMonsterPlacer.spawnCreature(p_82487_1_.func_82618_k(), ItemMonsterPlacer.getEntityName(p_82487_2_), d0, d1, d2); + + if (entity instanceof EntityLivingBase && p_82487_2_.func_82837_s()) + { @@ -509,6 +510,7 @@ } } diff --git a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch index eae24e0ab5..700d90d00d 100644 --- a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch @@ -91,7 +91,7 @@ + } } + -+ private static String getEntityName(ItemStack stack) ++ public static String getEntityName(ItemStack stack) + { + if (stack.func_77942_o() && stack.func_77978_p().func_150297_b("entity_name", 8)) + return stack.func_77978_p().func_74779_i("entity_name");