Prevents dragon eggs from teleporting outside of protection zone

#558
BentoBoxWorld · Mar 21, 2019 · 68a52c7 · 68a52c7
1 parent 05e5424
commit 68a52c7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/...ain/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java b/...ain/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
@@ -2,12 +2,14 @@
 
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 
 import world.bentobox.bentobox.api.flags.FlagListener;
@@ -276,4 +278,24 @@ private void checkClickedBlock(Event e, Player player, Location loc, Material ty
     public void onBlockBreak(final BlockBreakEvent e) {
         checkClickedBlock(e, e.getPlayer(), e.getBlock().getLocation(), e.getBlock().getType());
     }
+
+    /**
+     * Prevents dragon eggs from flying out of an island's protected space
+     * @param e - event
+     */
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onDragonEggTeleport(BlockFromToEvent e) {
+        Block from = e.getBlock();
+        if (!from.getType().equals(Material.DRAGON_EGG) || !getIWM().inWorld(from.getLocation())) {
+            return;
+        }
+        // If egg starts in a protected island...
+        getIslands().getProtectedIslandAt(from.getLocation()).ifPresent(fromIsland -> {
+            // Cancel if toIsland is not fromIsland or if there is no protected island there
+            // This protects against eggs dropping into adjacent islands, e.g. island distance and protection range are equal
+            e.setCancelled(getIslands().getProtectedIslandAt(e.getToBlock().getLocation()).map(toIsland -> {
+                return toIsland != fromIsland;
+            }).orElse(true));
+        });
+    }
 }
diff --git a/...java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListener.java b/...java/world/bentobox/bentobox/listeners/flags/worldsettings/LiquidsFlowingOutListener.java
@@ -40,4 +40,5 @@ public void onLiquidFlow(BlockFromToEvent e) {
             e.setCancelled(true);
         }
     }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,4 +40,5 @@ public void onLiquidFlow(BlockFromToEvent e) { @@
                 e.setCancelled(true);
             }
         }
     }