keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity
ForgePatch/patches/minecraft/net/minecraft/command/CommandEnchant.java.patch

12 lines
849 B
Diff
Raw Normal View History

Patches and rejected patches. Note: some which had imports are not listed here because they need to be refactored not to have imports. Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
2015-11-09 06:50:45 +00:00
--- ../src-base/minecraft/net/minecraft/command/CommandEnchant.java
+++ ../src-work/minecraft/net/minecraft/command/CommandEnchant.java
1.9.4 Update. 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.
2016-05-18 10:29:10 +00:00
@@ -86,7 +86,7 @@
Patches and rejected patches. Note: some which had imports are not listed here because they need to be refactored not to have imports. Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
2015-11-09 06:50:45 +00:00
{
Switch to srg patches
2016-03-12 00:59:24 +00:00
Enchantment enchantment1 = Enchantment.func_185262_c(k);
Patches and rejected patches. Note: some which had imports are not listed here because they need to be refactored not to have imports. Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
2015-11-09 06:50:45 +00:00
Switch to srg patches
2016-03-12 00:59:24 +00:00
- 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
Patches and rejected patches. Note: some which had imports are not listed here because they need to be refactored not to have imports. Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
2015-11-09 06:50:45 +00:00
{
Switch to srg patches
2016-03-12 00:59:24 +00:00
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"))});
Patches and rejected patches. Note: some which had imports are not listed here because they need to be refactored not to have imports. Progress: https://gist.github.com/cpw/29695e426e2b122cf8ff
2015-11-09 06:50:45 +00:00
}