Fix a few more invalid ticks

CitizensDev · Mar 12, 2023 · 4053795 · 4053795
1 parent bd8d5a7
commit 4053795
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java
@@ -509,7 +509,6 @@ public void reload() throws NPCLoadException {
         despawnNPCs(false);
         ProfileFetcher.reset();
         Skin.clearCache();
-
         getServer().getPluginManager().callEvent(new CitizensPreReloadEvent());
 
         saves.reloadFromSource();

diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -169,7 +169,7 @@ public boolean isSpawned() {
     @Override
     public boolean isUpdating(NPCUpdate update) {
         return update == NPCUpdate.PACKET
-                ? updateCounter > data().get(NPC.Metadata.PACKET_UPDATE_DELAY, Setting.PACKET_UPDATE_DELAY.asInt())
+                ? updateCounter > data().get(NPC.Metadata.PACKET_UPDATE_DELAY, Setting.PACKET_UPDATE_DELAY.asTicks())
                 : false;
     }
 

diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java b/main/src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
@@ -251,7 +251,7 @@ public void save(DataKey root) {
         } else {
             root.removeKey("distancemargin");
         }
-        if (defaultParams.updatePathRate() != Setting.DEFAULT_PATHFINDER_UPDATE_PATH_RATE.asInt()) {
+        if (defaultParams.updatePathRate() != Setting.DEFAULT_PATHFINDER_UPDATE_PATH_RATE.asTicks()) {
             root.setInt("updatepathrate", defaultParams.updatePathRate());
         } else {
             root.removeKey("updatepathrate");

diff --git a/main/src/main/java/net/citizensnpcs/trait/text/Text.java b/main/src/main/java/net/citizensnpcs/trait/text/Text.java
@@ -280,7 +280,7 @@ private void talk(Player player) {
         sendText(player);
 
         int delay = this.delay == -1
-                ? Setting.DEFAULT_TEXT_DELAY_MIN.asInt() + Util.getFastRandom()
+                ? Setting.DEFAULT_TEXT_DELAY_MIN.asTicks() + Util.getFastRandom()
                         .nextInt(Setting.DEFAULT_TEXT_DELAY_MAX.asTicks() - Setting.DEFAULT_TEXT_DELAY_MIN.asTicks())
                 : this.delay;
         if (delay <= 0)