Even closer

APDevTeam · Jun 4, 2024 · fac185e · fac185e
1 parent 5d5bd9b
commit fac185e
Showing 1 changed file with 6 additions and 7 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
@@ -186,8 +186,8 @@ public void onBlockDispense(@NotNull BlockDispenseEvent e) {
         e.setCancelled(true);
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onFlow(BlockFromToEvent e) {
+    @EventHandler
+    public void onFlow(@NotNull BlockFromToEvent e) {
         if (Settings.DisableSpillProtection || e.isCancelled())
             return;
         Block block = e.getBlock();
@@ -196,12 +196,11 @@ public void onFlow(BlockFromToEvent e) {
 
         MovecraftLocation loc = MathUtils.bukkit2MovecraftLoc(block.getLocation());
         MovecraftLocation toLoc = MathUtils.bukkit2MovecraftLoc(e.getToBlock().getLocation());
-        for (Craft craft : CraftManager.getInstance().getCrafts()) {
-            if (craft.getWorld() != e.getBlock().getWorld() || !craft.getHitBox().contains(loc) || craft.getFluidLocations().contains(toLoc))
-                continue;
+        Craft craft = MathUtils.fastNearestCraftToLoc(CraftManager.getInstance().getCrafts(), e.getBlock().getLocation());
+        if (craft == null || !craft.getHitBox().contains((loc)) || craft.getFluidLocations().contains(toLoc))
+            return;
 
-            e.setCancelled(true);
-        }
+        e.setCancelled(true);
     }
 
     @EventHandler