Implement break / place whitelists

DRE2N · Jul 28, 2016 · 914c31a · 914c31a
1 parent 80ceb79
commit 914c31a
Showing 1 changed file with 35 additions and 6 deletions.
diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java
@@ -38,11 +38,15 @@
 import io.github.dre2n.dungeonsxl.trigger.TriggerTypeDefault;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -470,12 +474,31 @@ public boolean onBreak(Player player, Block block) {
         }
 
         Game game = getGame();
-        if (game != null) {
-            GameRules rules = game.getRules();
-            if (rules.canBreakBlocks()) {
-                return (false);
-            } else if (rules.canBreakPlacedBlocks()) {
+        if (game == null) {
+            return true;
+        }
+
+        GameRules rules = game.getRules();
+        if (!rules.canBreakBlocks() && !rules.canBreakPlacedBlocks()) {
+            return true;
+        }
+
+        Map<Material, HashSet<Material>> whitelist = rules.getBreakWhitelist();
+        Material material = block.getType();
+        Material breakTool = player.getItemInHand().getType();
+
+        if (whitelist == null) {
+            if (rules.canBreakPlacedBlocks()) {
+                return (!placedBlocks.contains(block));
+            } else if (rules.canBreakBlocks()) {
+                return false;
+            }
+
+        } else if (whitelist.containsKey(material) && whitelist.get(material) == null | whitelist.get(material).isEmpty() | whitelist.get(material).contains(breakTool)) {
+            if (rules.canBreakPlacedBlocks()) {
                 return (!placedBlocks.contains(block));
+            } else if (rules.canBreakBlocks()) {
+                return false;
             }
         }
 
@@ -501,7 +524,13 @@ public boolean onPlace(Player player, Block block, Block against, ItemStack hand
             return true;
         }
 
-        if (game.getRules().canPlaceBlocks() || GamePlaceableBlock.canBuildHere(block, block.getFace(against), hand.getType(), this)) {
+        GameRules rules = game.getRules();
+        if (!rules.canPlaceBlocks() && !GamePlaceableBlock.canBuildHere(block, block.getFace(against), hand.getType(), this)) {
+            return true;
+        }
+
+        Set<Material> whitelist = rules.getPlaceWhitelist();
+        if (whitelist == null || whitelist.contains(block.getType())) {
             placedBlocks.add(block);
             return false;
         }