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

Use strings instead of UUID keys

Browse Source
This commit is contained in:
fullwall 2020-03-07 12:43:16 +08:00
parent f345ef3f16
commit 46b1ba6e98
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package net.citizensnpcs.trait;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@ -30,7 +29,7 @@ public class CommandTrait extends Trait {
private final Map<String, NPCCommand> commands = Maps.newHashMap();
@Persist
@DelegatePersistence(PlayerNPCCommandPersister.class)
private final Map<UUID, PlayerNPCCommand> cooldowns = Maps.newHashMap();
private final Map<String, PlayerNPCCommand> cooldowns = Maps.newHashMap();
public CommandTrait() {
super("commandtrait");
@ -92,13 +91,13 @@ public class CommandTrait extends Trait {
for (NPCCommand command : commands.values()) {
if (command.hand != hand && command.hand != Hand.BOTH)
continue;
PlayerNPCCommand info = cooldowns.get(player.getUniqueId());
PlayerNPCCommand info = cooldowns.get(player.getUniqueId().toString());
if (info != null && !info.canUse(player, command)) {
continue;
}
command.run(npc, player);
if (command.cooldown > 0 && info == null) {
cooldowns.put(player.getUniqueId(), new PlayerNPCCommand(command));
cooldowns.put(player.getUniqueId().toString(), new PlayerNPCCommand(command));
}
}
}