From d127841a34a1885769e23fe1380e8cb41c6cceca Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 18 Feb 2014 20:25:28 +0800
Subject: [PATCH] Packet update delay setting

---
 src/main/java/net/citizensnpcs/Settings.java  | 43 ++++++++++---------
 .../net/citizensnpcs/npc/CitizensNPC.java     |  2 +-
 .../npc/entity/EntityHumanNPC.java            |  2 +-
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/Settings.java b/src/main/java/net/citizensnpcs/Settings.java
index 30d7dcaf5..69da88d75 100644
--- a/src/main/java/net/citizensnpcs/Settings.java
+++ b/src/main/java/net/citizensnpcs/Settings.java
@@ -58,27 +58,27 @@ public class Settings {
         CHAT_FORMAT_TO_TARGET("npc.chat.format.to-target", "[<npc>] -> You: <text>"),
         CHAT_FORMAT_WITH_TARGETS_TO_BYSTANDERS("npc.chat.format.with-targets-to-bystanders",
                 "[<npc>] -> [<targets>]: <text>"),
-        CHAT_MAX_NUMBER_OF_TARGETS("npc.chat.options.max-number-of-targets-to-show", 2),
-        CHAT_MULTIPLE_TARGETS_FORMAT("npc.chat.options.multiple-targets-format",
-                "<target>|, <target>| & <target>| & others"),
-        CHAT_RANGE("npc.chat.options.range", 5),
-        CHECK_MINECRAFT_VERSION("advanced.check-minecraft-version", true),
-        DATABASE_DRIVER("storage.database.driver", ""),
-        DATABASE_PASSWORD("storage.database.password", ""),
-        DATABASE_URL("storage.database.url", ""),
-        DATABASE_USERNAME("storage.database.username", ""),
-        DEBUG_MODE("general.debug-mode", false),
-        DEBUG_PATHFINDING("general.debug-pathfinding", false),
-        DEFAULT_LOOK_CLOSE("npc.default.look-close.enabled", false),
-        DEFAULT_LOOK_CLOSE_RANGE("npc.default.look-close.range", 5),
-        DEFAULT_NPC_LIMIT("npc.limits.default-limit", 10),
-        DEFAULT_PATHFINDING_RANGE("npc.default.pathfinding.range", 25F),
-        DEFAULT_RANDOM_TALKER("npc.default.random-talker", true),
-        DEFAULT_REALISTIC_LOOKING("npc.default.realistic-looking", false),
-        DEFAULT_STATIONARY_TICKS("npc.default.stationary-ticks", -1),
-        DEFAULT_TALK_CLOSE("npc.default.talk-close.enabled", false),
-        DEFAULT_TALK_CLOSE_RANGE("npc.default.talk-close.range", 5),
-        DEFAULT_TEXT("npc.default.text.0", "Hi, I'm <npc>!") {
+                CHAT_MAX_NUMBER_OF_TARGETS("npc.chat.options.max-number-of-targets-to-show", 2),
+                CHAT_MULTIPLE_TARGETS_FORMAT("npc.chat.options.multiple-targets-format",
+                        "<target>|, <target>| & <target>| & others"),
+                        CHAT_RANGE("npc.chat.options.range", 5),
+                        CHECK_MINECRAFT_VERSION("advanced.check-minecraft-version", true),
+                        DATABASE_DRIVER("storage.database.driver", ""),
+                        DATABASE_PASSWORD("storage.database.password", ""),
+                        DATABASE_URL("storage.database.url", ""),
+                        DATABASE_USERNAME("storage.database.username", ""),
+                        DEBUG_MODE("general.debug-mode", false),
+                        DEBUG_PATHFINDING("general.debug-pathfinding", false),
+                        DEFAULT_LOOK_CLOSE("npc.default.look-close.enabled", false),
+                        DEFAULT_LOOK_CLOSE_RANGE("npc.default.look-close.range", 5),
+                        DEFAULT_NPC_LIMIT("npc.limits.default-limit", 10),
+                        DEFAULT_PATHFINDING_RANGE("npc.default.pathfinding.range", 25F),
+                        DEFAULT_RANDOM_TALKER("npc.default.random-talker", true),
+                        DEFAULT_REALISTIC_LOOKING("npc.default.realistic-looking", false),
+                        DEFAULT_STATIONARY_TICKS("npc.default.stationary-ticks", -1),
+                        DEFAULT_TALK_CLOSE("npc.default.talk-close.enabled", false),
+                        DEFAULT_TALK_CLOSE_RANGE("npc.default.talk-close.range", 5),
+                        DEFAULT_TEXT("npc.default.text.0", "Hi, I'm <npc>!") {
             @Override
             public void loadFromKey(DataKey root) {
                 List<String> list = new ArrayList<String>();
@@ -96,6 +96,7 @@ public class Settings {
         MESSAGE_COLOUR("general.color-scheme.message", "<a>"),
         NPC_ATTACK_DISTANCE("npc.pathfinding.attack-range", 1.75 * 1.75),
         NPC_COST("economy.npc.cost", 100D),
+        PACKET_UPDATE_DELAY("npc.packets.update-delay", 30),
         QUICK_SELECT("npc.selection.quick-select", false),
         REMOVE_PLAYERS_FROM_PLAYER_LIST("npc.player.remove-from-list", true),
         SAVE_TASK_DELAY("storage.save-task.delay", 20 * 60 * 60),
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 8808946ae..e4b0c8a9c 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -216,7 +216,7 @@ public class CitizensNPC extends AbstractNPC {
                     NMS.trySwim(getEntity());
                 }
                 navigator.run();
-                if (++packetUpdateCount > 30) {
+                if (++packetUpdateCount > Setting.PACKET_UPDATE_DELAY.asInt()) {
                     if (!getNavigator().isNavigating()) {
                         Player player = getEntity() instanceof Player ? (Player) getEntity() : null;
                         NMS.sendPacketNearby(player, getStoredLocation(),
diff --git a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
index 1cb9cea74..66a13fb2a 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
@@ -269,7 +269,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
     }
 
     private void updatePackets(boolean navigating) {
-        if (++packetUpdateCount >= 30) {
+        if (++packetUpdateCount >= Setting.PACKET_UPDATE_DELAY.asInt()) {
             Location current = getBukkitEntity().getLocation(packetLocationCache);
             Packet[] packets = new Packet[navigating ? 6 : 7];
             if (!navigating) {