Merge pull request #2268 from minzmann/master
[1.8.8] Minor Fixes to PotionEffect.java.patch
This commit is contained in:
commit
2ed4f39a13
1 changed files with 3 additions and 12 deletions
|
@ -57,16 +57,15 @@
|
||||||
+ */
|
+ */
|
||||||
+ public boolean isCurativeItem(net.minecraft.item.ItemStack stack)
|
+ public boolean isCurativeItem(net.minecraft.item.ItemStack stack)
|
||||||
+ {
|
+ {
|
||||||
+ boolean found = false;
|
|
||||||
+ for (net.minecraft.item.ItemStack curativeItem : this.curativeItems)
|
+ for (net.minecraft.item.ItemStack curativeItem : this.curativeItems)
|
||||||
+ {
|
+ {
|
||||||
+ if (curativeItem.func_77969_a(stack))
|
+ if (curativeItem.func_77969_a(stack))
|
||||||
+ {
|
+ {
|
||||||
+ found = true;
|
+ return true;
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return found;
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /***
|
+ /***
|
||||||
|
@ -84,15 +83,7 @@
|
||||||
+ */
|
+ */
|
||||||
+ public void addCurativeItem(net.minecraft.item.ItemStack stack)
|
+ public void addCurativeItem(net.minecraft.item.ItemStack stack)
|
||||||
+ {
|
+ {
|
||||||
+ boolean found = false;
|
+ if (!this.isCurativeItem(stack))
|
||||||
+ for (net.minecraft.item.ItemStack curativeItem : this.curativeItems)
|
|
||||||
+ {
|
|
||||||
+ if (curativeItem.func_77969_a(stack))
|
|
||||||
+ {
|
|
||||||
+ found = true;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (!found)
|
|
||||||
+ {
|
+ {
|
||||||
+ this.curativeItems.add(stack);
|
+ this.curativeItems.add(stack);
|
||||||
+ }
|
+ }
|
||||||
|
|
Loading…
Reference in a new issue