I like this more

This commit is contained in:
xGinko 2023-09-08 18:21:32 +02:00
parent 829ee11d52
commit 17155dd297

View File

@ -69,15 +69,14 @@ public class WorkstationOptimization implements VillagerOptimizerModule, Listene
double closestDistance = Double.MAX_VALUE; double closestDistance = Double.MAX_VALUE;
for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) { for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) {
if (entity.getType().equals(EntityType.VILLAGER)) { if (!entity.getType().equals(EntityType.VILLAGER)) continue;
Villager villager = (Villager) entity; Villager villager = (Villager) entity;
Villager.Profession profession = villager.getProfession(); Villager.Profession profession = villager.getProfession();
if (!profession.equals(Villager.Profession.NONE) && !profession.equals(Villager.Profession.NITWIT)) { 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) { WrappedVillager wVillager = villagerManager.getOrAdd(villager);
closest = wVillager; 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; double closestDistance = Double.MAX_VALUE;
for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) { for (Entity entity : workstationLoc.getNearbyEntities(search_radius, search_radius, search_radius)) {
if (entity.getType().equals(EntityType.VILLAGER)) { if (!entity.getType().equals(EntityType.VILLAGER)) continue;
Villager villager = (Villager) entity; Villager villager = (Villager) entity;
Villager.Profession profession = villager.getProfession(); Villager.Profession profession = villager.getProfession();
if (!profession.equals(Villager.Profession.NONE) && !profession.equals(Villager.Profession.NITWIT)) { 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) { WrappedVillager wVillager = villagerManager.getOrAdd(villager);
closest = wVillager; if (wVillager.isOptimized() && entity.getLocation().distance(workstationLoc) < closestDistance) {
} closest = wVillager;
}
} }
} }