Fix off by one command nUsed

CitizensDev · Feb 10, 2023 · 0f68429 · 0f68429
1 parent 41ca21a
commit 0f68429
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -671,8 +671,8 @@ public boolean canUse(CommandTrait trait, Player player, NPCCommand command) {
                 }
                 trait.globalCooldowns.remove(commandKey);
             }
-            int previouslyUsed = nUsed.getOrDefault(commandKey, 0);
-            if (command.n > 0 && command.n <= previouslyUsed) {
+            int timesUsed = nUsed.getOrDefault(commandKey, 0) + 1;
+            if (command.n > 0 && command.n <= timesUsed) {
                 trait.sendErrorMessage(player, CommandTraitError.MAXIMUM_TIMES_USED, null, command.n);
                 return false;
             }
@@ -683,7 +683,7 @@ public boolean canUse(CommandTrait trait, Player player, NPCCommand command) {
                 trait.globalCooldowns.put(commandKey, currentTimeSec);
             }
             if (command.n > 0) {
-                nUsed.put(commandKey, previouslyUsed + 1);
+                nUsed.put(commandKey, timesUsed);
             }
             lastUsedId = command.id;
             return true;