Merge branch 'potionIsBadEffect2' of https://github.com/mezz/MinecraftForge into mezz-potionIsBadEffect2

2015-12-01 09:02:36 -05:00 · 2015-12-01 09:02:36 -05:00 · d967c6d5d4
commit d967c6d5d4
parent 5087f30ca5 ebdcc11c80
1 changed files with 9 additions and 1 deletions
--- a/patches/minecraft/net/minecraft/potion/Potion.java.patch
+++ b/patches/minecraft/net/minecraft/potion/Potion.java.patch
@ -43,7 +43,15 @@
     }
 
     protected Potion func_76399_b(int p_76399_1_, int p_76399_2_)
-@@ -310,4 +314,27 @@
+@@ -230,7 +234,6 @@
+         return this.field_76417_J;
+     }
+ 
+-    @SideOnly(Side.CLIENT)
+     public boolean func_76398_f()
+     {
+         return this.field_76418_K;
+@@ -310,4 +313,27 @@
     {
         return p_111183_2_.func_111164_d() * (double)(p_111183_1_ + 1);
     }