Rewrite place listener

APDevTeam · Jun 1, 2024 · e546510 · e546510
1 parent 6a3073a
commit e546510
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/modules/Movecraft/src/main/java/net/countercraft/movecraft/listener/BlockListener.java b/modules/Movecraft/src/main/java/net/countercraft/movecraft/listener/BlockListener.java
@@ -78,25 +78,16 @@ public void onBlockPlace(BlockPlaceEvent e) {
         if (!Settings.ProtectPilotedCrafts)
             return;
 
-        Player p = e.getPlayer();
-
-        MovecraftLocation placedLocation = MathUtils.bukkit2MovecraftLoc(e.getBlockAgainst().getLocation());
-        for (Craft craft : CraftManager.getInstance().getCraftsInWorld(e.getBlock().getWorld())) {
-            if (craft == null || craft.getDisabled())
-                continue;
+        MovecraftLocation loc = MathUtils.bukkit2MovecraftLoc(e.getBlockAgainst().getLocation());
+        Craft craft = MathUtils.fastNearestCraftToLoc(CraftManager.getInstance().getCrafts(), e.getBlockAgainst().getLocation());
+        if (craft == null || !craft.getHitBox().contains(loc) || craft.getDisabled() || !(craft instanceof PilotedCraft))
+            return;
 
-            if(!(craft instanceof PilotedCraft)) {
-                continue;
-            }
-            if (((PilotedCraft) craft).getPilot() == p) {
-                continue;
-            }
+        Player p = e.getPlayer();
+        if (((PilotedCraft) craft).getPilot() == p)
+            return;
 
-            if (craft.getHitBox().contains(placedLocation)) {
-                e.setCancelled(true);
-                return;
-            }
-        }
+        e.setCancelled(true);
     }
 
     // prevent items from dropping from moving crafts