Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-05 07:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Remove extraneous code in command preprocess event handling

Browse Source
This commit is contained in:
Zarkrey 2024-12-01 00:56:54 +01:00 committed by GitHub
parent b560bbdec4
commit d31ff5553e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -65,7 +65,6 @@ import java.lang.management.ManagementFactory;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -705,21 +704,17 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
// If so, no need to check for (and write) new ones. // If so, no need to check for (and write) new ones.
boolean cooldownFound = false; boolean cooldownFound = false;
// Iterate over a copy of getCommandCooldowns in case of concurrent modifications for (final Entry<Pattern, Long> entry : user.getCommandCooldowns().entrySet()) {
for (final Entry<Pattern, Long> entry : new HashMap<>(user.getCommandCooldowns()).entrySet()) {
// Remove any expired cooldowns // Remove any expired cooldowns
if (entry.getValue() <= System.currentTimeMillis()) { if (entry.getValue() <= System.currentTimeMillis()) {
user.clearCommandCooldown(entry.getKey()); user.clearCommandCooldown(entry.getKey());
// Don't break in case there are other command cooldowns left to clear. // Don't break in case there are other command cooldowns left to clear.
} else if (entry.getKey().matcher(fullCommand).matches()) { } else if (entry.getKey().matcher(fullCommand).matches()) {
// User's current cooldown hasn't expired, inform and terminate cooldown code. // User's current cooldown hasn't expired, inform and terminate cooldown code.
if (entry.getValue() > System.currentTimeMillis()) {
final String commandCooldownTime = DateUtil.formatDateDiff(entry.getValue()); final String commandCooldownTime = DateUtil.formatDateDiff(entry.getValue());
user.sendTl("commandCooldown", commandCooldownTime); user.sendTl("commandCooldown", commandCooldownTime);
cooldownFound = true; cooldownFound = true;
event.setCancelled(true); event.setCancelled(true);
break;
}
} }
} }