Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-12 13:44:07 +01:00
Code Issues Projects Releases Wiki Activity

Refactor lookclose findNewTarget

Browse Source
This commit is contained in:
fullwall 2021-01-20 19:52:02 +08:00
parent 688ba3af8e
commit fe3f12e424
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/src/main/java/net/citizensnpcs/trait/LookClose.java
View File

@ -1,7 +1,5 @@
package net.citizensnpcs.trait; package net.citizensnpcs.trait;
import java.util.ArrayList;
import java.util.List;
import java.util.Random; import java.util.Random;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@ -69,7 +67,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
* Finds a new look-close target * Finds a new look-close target
*/ */
public void findNewTarget() { public void findNewTarget() {
List<Player> nearby = new ArrayList<>(); double min = Integer.MAX_VALUE;
for (Entity entity : npc.getEntity().getNearbyEntities(range, range, range)) { for (Entity entity : npc.getEntity().getNearbyEntities(range, range, range)) {
if (!(entity instanceof Player)) if (!(entity instanceof Player))
continue; continue;
@ -81,19 +79,10 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
double dist = location.distanceSquared(NPC_LOCATION); double dist = location.distanceSquared(NPC_LOCATION);
if (dist > range * range || CitizensAPI.getNPCRegistry().getNPC(entity) != null || isInvisible(player)) if (dist > range * range || CitizensAPI.getNPCRegistry().getNPC(entity) != null || isInvisible(player))
continue; continue;
nearby.add(player); if (dist < min) {
min = dist;
lookingAt = player;
} }
if (!nearby.isEmpty()) {
nearby.sort((o1, o2) -> {
Location l1 = o1.getLocation(CACHE_LOCATION);
Location l2 = o2.getLocation(CACHE_LOCATION2);
if (!NPC_LOCATION.getWorld().equals(l1.getWorld()) || !NPC_LOCATION.getWorld().equals(l2.getWorld())) {
return -1;
}
return Double.compare(l1.distanceSquared(NPC_LOCATION), l2.distanceSquared(NPC_LOCATION));
});
lookingAt = nearby.get(0);
} }
} }