Fix sequential command execution with commands on both hands

CitizensDev · Apr 25, 2021 · 145f9e4 · 145f9e4
1 parent 0e1e358
commit 145f9e4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -204,6 +204,10 @@ public int compare(NPCCommand o1, NPCCommand o2) {
                 for (NPCCommand command : commandList) {
                     if (executionMode == ExecutionMode.SEQUENTIAL) {
                         PlayerNPCCommand info = cooldowns.get(player.getUniqueId().toString());
+                        if (info != null && info.lastUsedHand != hand) {
+                            info.lastUsedHand = hand;
+                            info.lastUsedId = -1;
+                        }
                         if (info != null && command.id <= info.lastUsedId) {
                             if (info.lastUsedId == max) {
                                 info.lastUsedId = -1;
@@ -542,6 +546,8 @@ private static class PlayerNPCCommand {
         @Persist(valueType = Long.class)
         Map<String, Long> lastUsed = Maps.newHashMap();
         @Persist
+        Hand lastUsedHand;
+        @Persist
         int lastUsedId = -1;
         @Persist
         Map<String, Integer> nUsed = Maps.newHashMap();