From 40537955882bfed3593972dd4b9a3901858cd96c Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Mon, 13 Mar 2023 02:41:43 +0800
Subject: [PATCH] Fix a few more invalid ticks

---
 main/src/main/java/net/citizensnpcs/Citizens.java               | 1 -
 main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java        | 2 +-
 .../main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java    | 2 +-
 main/src/main/java/net/citizensnpcs/trait/text/Text.java        | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java
index ff3222dc7..7aa6fe0dc 100644
--- a/main/src/main/java/net/citizensnpcs/Citizens.java
+++ b/main/src/main/java/net/citizensnpcs/Citizens.java
@@ -509,7 +509,6 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
         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
index 7c68bb248..325bea1cc 100644
--- 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 class CitizensNPC extends AbstractNPC {
     @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
index d85a29150..11a68be4e 100644
--- 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 class CitizensNavigator implements Navigator, Runnable {
         } 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
index 6d74f1bc9..6ad92a843 100644
--- 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 @@ public class Text extends Trait implements Runnable, Listener {
         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)