From 17155dd297dc90448d22a3942c917d91608a0736 Mon Sep 17 00:00:00 2001 From: xGinko Date: Fri, 8 Sep 2023 18:21:32 +0200 Subject: [PATCH] I like this more --- .../modules/WorkstationOptimization.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java b/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java index de34881..7e44892 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/WorkstationOptimization.java @@ -69,15 +69,14 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene double closestDistance = Double.MAX_VALUE; for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) { - if (entity.getType().equals(EntityType.VILLAGER)) { - Villager villager = (Villager) entity; - Villager.Profession profession = villager.getProfession(); - if (!profession.equals(Villager.Profession.NONE) && !profession.equals(Villager.Profession.NITWIT)) { - WrappedVillager wVillager = villagerManager.getOrAdd(villager); - if (!wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) { - closest = wVillager; - } - } + if (!entity.getType().equals(EntityType.VILLAGER)) continue; + Villager villager = (Villager) entity; + Villager.Profession profession = villager.getProfession(); + if (profession.equals(Villager.Profession.NONE) || profession.equals(Villager.Profession.NITWIT)) continue; + + WrappedVillager wVillager = villagerManager.getOrAdd(villager); + if (!wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) { + closest = wVillager; } } @@ -112,15 +111,14 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene double closestDistance = Double.MAX_VALUE; for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) { - if (entity.getType().equals(EntityType.VILLAGER)) { - Villager villager = (Villager) entity; - Villager.Profession profession = villager.getProfession(); - if (!profession.equals(Villager.Profession.NONE) && !profession.equals(Villager.Profession.NITWIT)) { - WrappedVillager wVillager = villagerManager.getOrAdd(villager); - if (wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) { - closest = wVillager; - } - } + if (!entity.getType().equals(EntityType.VILLAGER)) continue; + Villager villager = (Villager) entity; + Villager.Profession profession = villager.getProfession(); + if (profession.equals(Villager.Profession.NONE) || profession.equals(Villager.Profession.NITWIT)) continue; + + WrappedVillager wVillager = villagerManager.getOrAdd(villager); + if (wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) { + closest = wVillager; } }