Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wrong load order

This commit is contained in:
fullwall 2019-09-23 21:12:21 +08:00
parent c072a0887a
commit 023ab5e8a6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,13 +116,6 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
@Override
public void load(DataKey key) {
range = key.getDouble("range");
// TODO: remove in a later version, defaults weren't saving properly
if (randomPitchRange == null) {
randomPitchRange = new float[] { -10, 0 };
}
if (randomYawRange == null) {
randomYawRange = new float[] { 0, 360 };
}
}
/**
@ -148,6 +141,13 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
public void run() {
if (!enabled || !npc.isSpawned() || npc.getNavigator().isNavigating())
return;
// TODO: remove in a later version, defaults weren't saving properly
if (randomPitchRange == null) {
randomPitchRange = new float[] { -10, 0 };
}
if (randomYawRange == null) {
randomYawRange = new float[] { 0, 360 };
}
npc.getEntity().getLocation(NPC_LOCATION);
if (hasInvalidTarget()) {
findNewTarget();