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

Remove deprecated method and double check world when resetting player skins

Browse Source
This commit is contained in:
fullwall 2015-12-19 14:43:56 +08:00
parent 73c37eb7db
commit 6085f2233d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
View File

@ -175,11 +175,6 @@ public class CitizensNavigator implements Navigator, Runnable {
switchStrategyTo(newStrategy); switchStrategyTo(newStrategy);
} }
@Override
public void setTarget(LivingEntity target, boolean aggressive) {
setTarget((Entity) target, aggressive);
}
@Override @Override
public void setTarget(Location target) { public void setTarget(Location target) {
if (!npc.isSpawned()) if (!npc.isSpawned())

6
src/main/java/net/citizensnpcs/npc/skin/SkinUpdateTracker.java
View File

@ -219,8 +219,10 @@ public class SkinUpdateTracker {
for (Player player : players) { for (Player player : players) {
if (player.hasMetadata("NPC")) if (player.hasMetadata("NPC"))
continue; continue;
Location ploc = player.getLocation(CACHE_LOCATION);
double distanceSquared = player.getLocation(CACHE_LOCATION).distanceSquared(location); if (ploc.getWorld() != location.getWorld())
continue;
double distanceSquared = ploc.distanceSquared(location);
if (distanceSquared > viewDistance) if (distanceSquared > viewDistance)
continue; continue;