Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-02 21:41:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix off by one command nUsed

Browse Source
This commit is contained in:
fullwall 2023-02-10 23:42:57 +08:00
parent 41ca21a131
commit 0f6842991b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
View File

@ -671,8 +671,8 @@ public class CommandTrait extends Trait {
}
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 class CommandTrait extends Trait {
trait.globalCooldowns.put(commandKey, currentTimeSec);
}
if (command.n > 0) {
nUsed.put(commandKey, previouslyUsed + 1);
nUsed.put(commandKey, timesUsed);
}
lastUsedId = command.id;
return true;