From 09caabba73f2d4fd8d3f472971a16546404d829d Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:58:30 +0200 Subject: [PATCH] Rename MapleCoolDownValueHolder --- src/main/java/client/Character.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 78a780773e..e271d0d5b1 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -190,7 +190,7 @@ public class Character extends AbstractCharacterObject { private final Map buffExpires = new LinkedHashMap<>(); private final Map keymap = new LinkedHashMap<>(); private final Map summons = new LinkedHashMap<>(); - private final Map coolDowns = new LinkedHashMap<>(); + private final Map coolDowns = new LinkedHashMap<>(); private final EnumMap> diseases = new EnumMap<>(Disease.class); private byte[] m_aQuickslotLoaded; private QuickslotBinding m_pQuickslotKeyMapped; @@ -517,7 +517,7 @@ public class Character extends AbstractCharacterObject { effLock.lock(); chrLock.lock(); try { - this.coolDowns.put(Integer.valueOf(skillId), new MapleCoolDownValueHolder(skillId, startTime, length)); + this.coolDowns.put(Integer.valueOf(skillId), new CooldownValueHolder(skillId, startTime, length)); } finally { chrLock.unlock(); effLock.unlock(); @@ -2891,7 +2891,7 @@ public class Character extends AbstractCharacterObject { skillCooldownTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { - Set> es; + Set> es; effLock.lock(); chrLock.lock(); @@ -2903,8 +2903,8 @@ public class Character extends AbstractCharacterObject { } long curTime = Server.getInstance().getCurrentTime(); - for (Entry bel : es) { - MapleCoolDownValueHolder mcdvh = bel.getValue(); + for (Entry bel : es) { + CooldownValueHolder mcdvh = bel.getValue(); if (curTime >= mcdvh.startTime + mcdvh.length) { removeCooldown(mcdvh.skillId); sendPacket(PacketCreator.skillCooldown(mcdvh.skillId, 0)); @@ -3220,7 +3220,7 @@ public class Character extends AbstractCharacterObject { effLock.lock(); chrLock.lock(); try { - for (MapleCoolDownValueHolder mcdvh : coolDowns.values()) { + for (CooldownValueHolder mcdvh : coolDowns.values()) { ret.add(new PlayerCoolDownValueHolder(mcdvh.skillId, mcdvh.startTime, mcdvh.length)); } } finally { @@ -7488,12 +7488,12 @@ public class Character extends AbstractCharacterObject { } } - public static class MapleCoolDownValueHolder { + public static class CooldownValueHolder { public int skillId; public long startTime, length; - public MapleCoolDownValueHolder(int skillId, long startTime, long length) { + public CooldownValueHolder(int skillId, long startTime, long length) { super(); this.skillId = skillId; this.startTime = startTime; @@ -7949,8 +7949,8 @@ public class Character extends AbstractCharacterObject { effLock.lock(); chrLock.lock(); try { - ArrayList list = new ArrayList<>(coolDowns.values()); - for (MapleCoolDownValueHolder mcvh : list) { + ArrayList list = new ArrayList<>(coolDowns.values()); + for (CooldownValueHolder mcvh : list) { if (mcvh.skillId != id) { coolDowns.remove(mcvh.skillId); if (packet) {