Start working back toward performance gains

APDevTeam · Jun 4, 2024 · 328f6d8 · 328f6d8
1 parent ccddfa5
commit 328f6d8
Showing 1 changed file with 8 additions and 9 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,19 +186,18 @@ public void onBlockDispense(@NotNull BlockDispenseEvent e) {
         e.setCancelled(true);
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onFlow(BlockFromToEvent e) {
-        if (Settings.DisableSpillProtection)
-            return;
-        if (!e.getBlock().isLiquid())
+        if (Settings.DisableSpillProtection || !Tags.FLUID.contains(e.getBlock().getType()))
             return;
+
         MovecraftLocation loc = MathUtils.bukkit2MovecraftLoc(e.getBlock().getLocation());
         MovecraftLocation toLoc = MathUtils.bukkit2MovecraftLoc(e.getToBlock().getLocation());
-        for (Craft craft : CraftManager.getInstance().getCraftsInWorld(e.getBlock().getWorld())) {
-            if (craft.getHitBox().contains((loc)) && !craft.getFluidLocations().contains(toLoc)) {
-                e.setCancelled(true);
-                break;
-            }
+        for (Craft craft : CraftManager.getInstance().getCrafts()) {
+            if (craft.getWorld() != e.getBlock().getWorld() || !craft.getHitBox().contains(loc) || craft.getFluidLocations().contains(toLoc))
+                continue;
+
+            e.setCancelled(true);
         }
     }