mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 18:45:09 +00:00
Major things to note: Class renames: https://gist.github.com/LexManos/44dd211f90f498ad4015279b103dff86 Tile Entities are now packed in the ChunkData packet. Forge intends to work around this to better support large moded worlds, but for the time being modders should implement the new function carefully and only send what data they need to! Minecraft's codebase now has annotations, these are directly from Mojang and should be adheared to! Added support for package-info.java's containing @Nullable information for all MC code base.
12 lines
849 B
Diff
12 lines
849 B
Diff
--- ../src-base/minecraft/net/minecraft/command/CommandEnchant.java
|
|
+++ ../src-work/minecraft/net/minecraft/command/CommandEnchant.java
|
|
@@ -86,7 +86,7 @@
|
|
{
|
|
Enchantment enchantment1 = Enchantment.func_185262_c(k);
|
|
|
|
- if (!enchantment.func_77326_a(enchantment1))
|
|
+ if (!enchantment.func_77326_a(enchantment1) || !enchantment1.func_77326_a(enchantment)) //Forge BugFix: Let Both enchantments veto being together
|
|
{
|
|
throw new CommandException("commands.enchant.cantCombine", new Object[] {enchantment.func_77316_c(i), enchantment1.func_77316_c(nbttaglist.func_150305_b(j).func_74765_d("lvl"))});
|
|
}
|