diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java index c91b10a79..165d2484d 100644 --- a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java @@ -300,8 +300,9 @@ public class CommandTrait extends Trait { } } runCommand(player, command); - if (executionMode == ExecutionMode.SEQUENTIAL) { - playerTracking.get(player.getUniqueId()).lastUsedHand = hand; + if (executionMode == ExecutionMode.SEQUENTIAL + && (info = playerTracking.get(player.getUniqueId())) != null) { + info.lastUsedHand = hand; } if (executionMode == ExecutionMode.SEQUENTIAL || (charged != null && !charged)) break;