Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleDiseaseValueHolder

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:16:02 +02:00
parent 0c721b85dd
commit 56c9e0f664
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/client/Character.java
View File

@@ -191,7 +191,7 @@ public class Character extends AbstractCharacterObject {
private final Map<Integer, KeyBinding> keymap = new LinkedHashMap<>(); private final Map<Integer, KeyBinding> keymap = new LinkedHashMap<>();
private final Map<Integer, MapleSummon> summons = new LinkedHashMap<>(); private final Map<Integer, MapleSummon> summons = new LinkedHashMap<>();
private final Map<Integer, MapleCoolDownValueHolder> coolDowns = new LinkedHashMap<>(); private final Map<Integer, MapleCoolDownValueHolder> coolDowns = new LinkedHashMap<>();
private final EnumMap<Disease, Pair<MapleDiseaseValueHolder, MobSkill>> diseases = new EnumMap<>(Disease.class); private final EnumMap<Disease, Pair<DiseaseValueHolder, MobSkill>> diseases = new EnumMap<>(Disease.class);
private byte[] m_aQuickslotLoaded; private byte[] m_aQuickslotLoaded;
private QuickslotBinding m_pQuickslotKeyMapped; private QuickslotBinding m_pQuickslotKeyMapped;
private MapleDoor pdoor = null; private MapleDoor pdoor = null;
@@ -2561,8 +2561,8 @@ public class Character extends AbstractCharacterObject {
Map<Disease, Pair<Long, MobSkill>> ret = new LinkedHashMap<>(); Map<Disease, Pair<Long, MobSkill>> ret = new LinkedHashMap<>();
for (Entry<Disease, Long> de : diseaseExpires.entrySet()) { for (Entry<Disease, Long> de : diseaseExpires.entrySet()) {
Pair<MapleDiseaseValueHolder, MobSkill> dee = diseases.get(de.getKey()); Pair<DiseaseValueHolder, MobSkill> dee = diseases.get(de.getKey());
MapleDiseaseValueHolder mdvh = dee.getLeft(); DiseaseValueHolder mdvh = dee.getLeft();
ret.put(de.getKey(), new Pair<>(mdvh.length - (curtime - mdvh.startTime), dee.getRight())); ret.put(de.getKey(), new Pair<>(mdvh.length - (curtime - mdvh.startTime), dee.getRight()));
} }
@@ -2582,7 +2582,7 @@ public class Character extends AbstractCharacterObject {
long expTime = curTime + di.getValue().getLeft(); long expTime = curTime + di.getValue().getLeft();
diseaseExpires.put(di.getKey(), expTime); diseaseExpires.put(di.getKey(), expTime);
diseases.put(di.getKey(), new Pair<>(new MapleDiseaseValueHolder(curTime, di.getValue().getLeft()), di.getValue().getRight())); diseases.put(di.getKey(), new Pair<>(new DiseaseValueHolder(curTime, di.getValue().getLeft()), di.getValue().getRight()));
} }
} finally { } finally {
chrLock.unlock(); chrLock.unlock();
@@ -2590,7 +2590,7 @@ public class Character extends AbstractCharacterObject {
} }
public void announceDiseases() { public void announceDiseases() {
Set<Entry<Disease, Pair<MapleDiseaseValueHolder, MobSkill>>> chrDiseases; Set<Entry<Disease, Pair<DiseaseValueHolder, MobSkill>>> chrDiseases;
chrLock.lock(); chrLock.lock();
try { try {
@@ -2604,7 +2604,7 @@ public class Character extends AbstractCharacterObject {
chrLock.unlock(); chrLock.unlock();
} }
for (Entry<Disease, Pair<MapleDiseaseValueHolder, MobSkill>> di : chrDiseases) { for (Entry<Disease, Pair<DiseaseValueHolder, MobSkill>> di : chrDiseases) {
Disease disease = di.getKey(); Disease disease = di.getKey();
MobSkill skill = di.getValue().getRight(); MobSkill skill = di.getValue().getRight();
final List<Pair<Disease, Integer>> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); final List<Pair<Disease, Integer>> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX())));
@@ -2647,7 +2647,7 @@ public class Character extends AbstractCharacterObject {
try { try {
long curTime = Server.getInstance().getCurrentTime(); long curTime = Server.getInstance().getCurrentTime();
diseaseExpires.put(disease, curTime + skill.getDuration()); diseaseExpires.put(disease, curTime + skill.getDuration());
diseases.put(disease, new Pair<>(new MapleDiseaseValueHolder(curTime, skill.getDuration()), skill)); diseases.put(disease, new Pair<>(new DiseaseValueHolder(curTime, skill.getDuration()), skill));
} finally { } finally {
chrLock.unlock(); chrLock.unlock();
} }

5
src/main/java/client/MapleDiseaseValueHolder.java → src/main/java/client/DiseaseValueHolder.java
View File

@@ -21,13 +21,12 @@
package client; package client;
/** /**
*
* @author anybody can do this * @author anybody can do this
*/ */
public class MapleDiseaseValueHolder { public class DiseaseValueHolder {
public long startTime, length; public long startTime, length;
public MapleDiseaseValueHolder(long start, long length) { public DiseaseValueHolder(long start, long length) {
this.startTime = start; this.startTime = start;
this.length = length; this.length = length;
} }