12 lines
853 B
Diff
12 lines
853 B
Diff
--- ../src-base/minecraft/net/minecraft/command/CommandEnchant.java
|
|
+++ ../src-work/minecraft/net/minecraft/command/CommandEnchant.java
|
|
@@ -93,7 +93,7 @@
|
|
{
|
|
Enchantment enchantment2 = Enchantment.func_180306_c(l);
|
|
|
|
- if (!enchantment2.func_77326_a(enchantment1))
|
|
+ if (!enchantment2.func_77326_a(enchantment1) || !enchantment1.func_77326_a(enchantment2)) //Forge BugFix: Let Both enchantments veto being together
|
|
{
|
|
throw new CommandException("commands.enchant.cantCombine", new Object[] {enchantment1.func_77316_c(j), enchantment2.func_77316_c(nbttaglist.func_150305_b(k).func_74765_d("lvl"))});
|
|
}
|