Fix enchanting applying the same enchantment multiple times. Closes #2273
This commit is contained in:
parent
82537e5763
commit
9032f7e37e
|
@ -25,7 +25,7 @@
|
||||||
- if (!enchantmentdata1.field_76302_b.func_77326_a(Enchantment.func_180306_c(integer.intValue())))
|
- if (!enchantmentdata1.field_76302_b.func_77326_a(Enchantment.func_180306_c(integer.intValue())))
|
||||||
+ Enchantment e1 = enchantmentdata1.field_76302_b;
|
+ Enchantment e1 = enchantmentdata1.field_76302_b;
|
||||||
+ Enchantment e2 = Enchantment.func_180306_c(integer.intValue());
|
+ Enchantment e2 = Enchantment.func_180306_c(integer.intValue());
|
||||||
+ if (e1.func_77326_a(e2) && e2.func_77326_a(e1)) //Forge BugFix: Let Both enchantments veto being together
|
+ if (!e1.func_77326_a(e2) || !e2.func_77326_a(e1)) //Forge BugFix: Let Both enchantments veto being together
|
||||||
{
|
{
|
||||||
flag = false;
|
flag = false;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue