Browse Source

Added missing 1.14 blocks to ability/tool activation blacklists (Fixes #4050)

Shane Freeder 5 years ago
parent
commit
122c8b0faa
2 changed files with 12 additions and 0 deletions
  1. 3 0
      Changelog.txt
  2. 9 0
      src/main/java/com/gmail/nossr50/util/MaterialMapStore.java

+ 3 - 0
Changelog.txt

@@ -1,3 +1,6 @@
+Version 2.1.109
+    Added missing 1.14 blocks to ability/tool activation blacklists
+
 Version 2.1.108
 Version 2.1.108
     Fixed an amusing exploit for easy leveling in Acrobatics
     Fixed an amusing exploit for easy leveling in Acrobatics
     mcMMO should no longer break if FAWE is being used in conjunction with WG on the server
     mcMMO should no longer break if FAWE is being used in conjunction with WG on the server

+ 9 - 0
src/main/java/com/gmail/nossr50/util/MaterialMapStore.java

@@ -311,6 +311,7 @@ public class MaterialMapStore {
         abilityBlackList.add("gold_block");
         abilityBlackList.add("gold_block");
         abilityBlackList.add("bell");
         abilityBlackList.add("bell");
         abilityBlackList.add("barrel");
         abilityBlackList.add("barrel");
+        abilityBlackList.add("blast_furnace");
         abilityBlackList.add("campfire");
         abilityBlackList.add("campfire");
         abilityBlackList.add("composter");
         abilityBlackList.add("composter");
 
 
@@ -319,6 +320,7 @@ public class MaterialMapStore {
     private void fillToolBlackList()
     private void fillToolBlackList()
     {
     {
         //TODO: Add anvils / missing logs
         //TODO: Add anvils / missing logs
+        //TODO: Reorganize this list, can we also dynamically populate some of this?
         toolBlackList.add("black_bed");
         toolBlackList.add("black_bed");
         toolBlackList.add("blue_bed");
         toolBlackList.add("blue_bed");
         toolBlackList.add("brown_bed");
         toolBlackList.add("brown_bed");
@@ -442,8 +444,15 @@ public class MaterialMapStore {
         toolBlackList.add("gold_block");
         toolBlackList.add("gold_block");
         toolBlackList.add("bell");
         toolBlackList.add("bell");
         toolBlackList.add("barrel");
         toolBlackList.add("barrel");
+        toolBlackList.add("blast_furnace");
         toolBlackList.add("campfire");
         toolBlackList.add("campfire");
+        toolBlackList.add("cartography_table");
         toolBlackList.add("composter");
         toolBlackList.add("composter");
+        toolBlackList.add("grindstone");
+        toolBlackList.add("lectern");
+        toolBlackList.add("loom");
+        toolBlackList.add("smoker");
+        toolBlackList.add("stonecutter");
     }
     }
 
 
     private void addToHashSet(String string, HashSet<String> stringHashSet)
     private void addToHashSet(String string, HashSet<String> stringHashSet)