From 1a78b2dad7a8f4202a3bc1396d749292576addfe Mon Sep 17 00:00:00 2001 From: luisc Date: Fri, 17 Dec 2021 17:30:50 -0600 Subject: [PATCH] Timers are only updated if a timer exists for a player. --- src/main/java/noppes/npcs/ScriptPlayerEventHandler.java | 3 ++- src/main/java/noppes/npcs/entity/data/DataTimers.java | 2 ++ src/main/java/noppes/npcs/scripted/interfaces/ITimers.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 254e18949..1a5628905 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -70,7 +70,8 @@ public class ScriptPlayerEventHandler { if(PlayerDataController.instance != null) { PlayerDataController.instance.getPlayerData(player).scriptData = data.scriptData; - PlayerDataController.instance.getPlayerData(player).timers.update(); + if(PlayerDataController.instance.getPlayerData(player).timers.size() > 0) + PlayerDataController.instance.getPlayerData(player).timers.update(); } } } diff --git a/src/main/java/noppes/npcs/entity/data/DataTimers.java b/src/main/java/noppes/npcs/entity/data/DataTimers.java index 34f0adb3b..58378e07a 100644 --- a/src/main/java/noppes/npcs/entity/data/DataTimers.java +++ b/src/main/java/noppes/npcs/entity/data/DataTimers.java @@ -101,6 +101,8 @@ public class DataTimers implements ITimers { this.timers = new HashMap(); } + public int size() { return this.timers.size(); } + class Timer { public int id; private boolean repeat; diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java b/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java index c01509e34..f69b93032 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/ITimers.java @@ -17,4 +17,6 @@ public interface ITimers { void reset(int var1); void clear(); + + int size(); }