Fixes item frame protection by flag. Also affects armor stands

#1023
BentoBoxWorld · Nov 7, 2019 · d3e35a9 · d3e35a9 · Poslovitch · Nov 7, 2019
1 parent 21e75c6
commit d3e35a9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java
@@ -1,5 +1,6 @@
 package world.bentobox.bentobox.listeners.flags.protection;
 
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.ArmorStand;
@@ -108,14 +109,25 @@ public void onEntityDamage(EntityDamageByEntityEvent e) {
         }
         // Get the attacker
         if (e.getDamager() instanceof Player) {
-            checkIsland(e, (Player)e.getDamager(), e.getEntity().getLocation(), Flags.BREAK_BLOCKS);
+            // Check the break blocks flag
+            notAllowed(e, (Player)e.getDamager(), e.getEntity().getLocation());
         } else if (e.getDamager() instanceof Projectile) {
             // Find out who fired the arrow
             Projectile p = (Projectile) e.getDamager();
-            if (p.getShooter() instanceof Player && !checkIsland(e, (Player)p.getShooter(), e.getEntity().getLocation(), Flags.BREAK_BLOCKS)) {
+            if (p.getShooter() instanceof Player && notAllowed(e, (Player)p.getShooter(), e.getEntity().getLocation())) {
                 e.getEntity().setFireTicks(0);
                 p.setFireTicks(0);
             }
         }
     }
+
+    private boolean notAllowed(EntityDamageByEntityEvent e, Player player, Location location) {
+        if (!checkIsland(e, player, location, Flags.BREAK_BLOCKS)) return true;
+        if (e.getEntity() instanceof ItemFrame) {
+            return !checkIsland(e, player, location, Flags.ITEM_FRAME);
+        } else if (e.getEntity() instanceof ArmorStand) {
+            return !checkIsland(e, player, location, Flags.ARMOR_STAND);
+        }
+        return false;        
+    }
 }
diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/PlaceBlocksListener.java
@@ -39,7 +39,8 @@ public void onBlockPlace(final BlockPlaceEvent e) {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerHitItemFrame(PlayerInteractEntityEvent e) {
         if (e.getRightClicked().getType().equals(EntityType.ITEM_FRAME)) {
-            checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.PLACE_BLOCKS);
+            if (!checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.PLACE_BLOCKS)) return;
+            checkIsland(e, e.getPlayer(), e.getRightClicked().getLocation(), Flags.ITEM_FRAME);
         }
     }