Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 02:55:45 +01:00
Code Issues Projects Releases Wiki Activity

Minor microoptimisation

Browse Source
This commit is contained in:
fullwall 2018-04-09 17:41:53 +08:00
parent 74989cd93e
commit 184b414dd5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/main/java/net/citizensnpcs/trait/text/Text.java
View File

@ -1,7 +1,6 @@
package net.citizensnpcs.trait.text; package net.citizensnpcs.trait.text;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -38,7 +37,7 @@ import net.citizensnpcs.util.Util;
@TraitName("text") @TraitName("text")
public class Text extends Trait implements Runnable, Toggleable, Listener, ConversationAbandonedListener { public class Text extends Trait implements Runnable, Toggleable, Listener, ConversationAbandonedListener {
private final Map<UUID, Date> cooldowns = Maps.newHashMap(); private final Map<UUID, Long> cooldowns = Maps.newHashMap();
private int currentIndex; private int currentIndex;
private int delay = -1; private int delay = -1;
private String itemInHandPattern = "default"; private String itemInHandPattern = "default";
@ -139,9 +138,9 @@ public class Text extends Trait implements Runnable, Toggleable, Listener, Conve
continue; continue;
Player player = (Player) search; Player player = (Player) search;
// If the cooldown is not expired, do not send text // If the cooldown is not expired, do not send text
Date cooldown = cooldowns.get(player.getUniqueId()); Long cooldown = cooldowns.get(player.getUniqueId());
if (cooldown != null) { if (cooldown != null) {
if (!new Date().after(cooldown)) { if (System.currentTimeMillis() < cooldown) {
return; return;
} }
cooldowns.remove(player.getUniqueId()); cooldowns.remove(player.getUniqueId());
@ -149,15 +148,13 @@ public class Text extends Trait implements Runnable, Toggleable, Listener, Conve
if (!sendText(player)) if (!sendText(player))
return; return;
// Add a cooldown if the text was successfully sent // Add a cooldown if the text was successfully sent
Date wait = new Date();
int secondsDelta = delay != -1 ? delay int secondsDelta = delay != -1 ? delay
: RANDOM.nextInt(Setting.TALK_CLOSE_MAXIMUM_COOLDOWN.asInt()) : RANDOM.nextInt(Setting.TALK_CLOSE_MAXIMUM_COOLDOWN.asInt())
+ Setting.TALK_CLOSE_MINIMUM_COOLDOWN.asInt(); + Setting.TALK_CLOSE_MINIMUM_COOLDOWN.asInt();
if (secondsDelta <= 0) if (secondsDelta <= 0)
return; return;
long millisecondsDelta = TimeUnit.MILLISECONDS.convert(secondsDelta, TimeUnit.SECONDS); long millisecondsDelta = TimeUnit.MILLISECONDS.convert(secondsDelta, TimeUnit.SECONDS);
wait.setTime(wait.getTime() + millisecondsDelta); cooldowns.put(player.getUniqueId(), System.currentTimeMillis() + millisecondsDelta);
cooldowns.put(player.getUniqueId(), wait);
} }
} }