From 0c721b85dd3c2d772ad883e6ddbd0fc338ed9d0e Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:15:22 +0200 Subject: [PATCH] Rename and clean up MapleDisease --- src/main/java/client/Character.java | 86 +++++++++---------- .../{MapleDisease.java => Disease.java} | 44 +++++----- .../command/commands/gm3/DebuffCommand.java | 24 +++--- .../java/constants/game/GameConstants.java | 6 +- .../java/net/server/PlayerBuffStorage.java | 17 ++-- .../net/server/PlayerDiseaseValueHolder.java | 6 +- .../channel/handlers/CancelDebuffHandler.java | 10 +-- .../handlers/MonsterCarnivalHandler.java | 4 +- .../handlers/PlayerLoggedinHandler.java | 6 +- .../channel/handlers/UseItemHandler.java | 12 +-- src/main/java/server/MapleStatEffect.java | 28 +++--- src/main/java/server/life/MobSkill.java | 28 +++--- .../partyquest/MapleCarnivalFactory.java | 6 +- src/main/java/tools/PacketCreator.java | 20 ++--- 14 files changed, 149 insertions(+), 148 deletions(-) rename src/main/java/client/{MapleDisease.java => Disease.java} (76%) diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 9a141d2c8f..7bbdfa9639 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -185,13 +185,13 @@ public class Character extends AbstractCharacterObject { private final Map activeCouponRates = new LinkedHashMap<>(); private final EnumMap effects = new EnumMap<>(BuffStat.class); private final Map buffEffectsCount = new LinkedHashMap<>(); - private final Map diseaseExpires = new LinkedHashMap<>(); + private final Map diseaseExpires = new LinkedHashMap<>(); private final Map> buffEffects = new LinkedHashMap<>(); // non-overriding buffs thanks to Ronan 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 EnumMap> diseases = new EnumMap<>(MapleDisease.class); + private final EnumMap> diseases = new EnumMap<>(Disease.class); private byte[] m_aQuickslotLoaded; private QuickslotBinding m_pQuickslotKeyMapped; private MapleDoor pdoor = null; @@ -2536,7 +2536,7 @@ public class Character extends AbstractCharacterObject { } } - public final boolean hasDisease(final MapleDisease dis) { + public final boolean hasDisease(final Disease dis) { chrLock.lock(); try { return diseases.containsKey(dis); @@ -2554,13 +2554,13 @@ public class Character extends AbstractCharacterObject { } } - public Map> getAllDiseases() { + public Map> getAllDiseases() { chrLock.lock(); try { long curtime = Server.getInstance().getCurrentTime(); - Map> ret = new LinkedHashMap<>(); + Map> ret = new LinkedHashMap<>(); - for (Entry de : diseaseExpires.entrySet()) { + for (Entry de : diseaseExpires.entrySet()) { Pair dee = diseases.get(de.getKey()); MapleDiseaseValueHolder mdvh = dee.getLeft(); @@ -2573,12 +2573,12 @@ public class Character extends AbstractCharacterObject { } } - public void silentApplyDiseases(Map> diseaseMap) { + public void silentApplyDiseases(Map> diseaseMap) { chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); - for (Entry> di : diseaseMap.entrySet()) { + for (Entry> di : diseaseMap.entrySet()) { long expTime = curTime + di.getValue().getLeft(); diseaseExpires.put(di.getKey(), expTime); @@ -2590,7 +2590,7 @@ public class Character extends AbstractCharacterObject { } public void announceDiseases() { - Set>> chrDiseases; + Set>> chrDiseases; chrLock.lock(); try { @@ -2604,12 +2604,12 @@ public class Character extends AbstractCharacterObject { chrLock.unlock(); } - for (Entry> di : chrDiseases) { - MapleDisease disease = di.getKey(); + for (Entry> di : chrDiseases) { + Disease disease = di.getKey(); MobSkill skill = di.getValue().getRight(); - final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); + final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); - if (disease != MapleDisease.SLOW) { + if (disease != Disease.SLOW) { map.broadcastMessage(PacketCreator.giveForeignDebuff(id, debuff, skill)); } else { map.broadcastMessage(PacketCreator.giveForeignSlowDebuff(id, debuff, skill)); @@ -2621,12 +2621,12 @@ public class Character extends AbstractCharacterObject { for (Character chr : map.getAllPlayers()) { int cid = chr.getId(); - for (Entry> di : chr.getAllDiseases().entrySet()) { - MapleDisease disease = di.getKey(); + for (Entry> di : chr.getAllDiseases().entrySet()) { + Disease disease = di.getKey(); MobSkill skill = di.getValue().getRight(); - final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); + final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); - if (disease != MapleDisease.SLOW) { + if (disease != Disease.SLOW) { this.sendPacket(PacketCreator.giveForeignDebuff(cid, debuff, skill)); } else { this.sendPacket(PacketCreator.giveForeignSlowDebuff(cid, debuff, skill)); @@ -2635,9 +2635,9 @@ public class Character extends AbstractCharacterObject { } } - public void giveDebuff(final MapleDisease disease, MobSkill skill) { + public void giveDebuff(final Disease disease, MobSkill skill) { if (!hasDisease(disease) && getDiseasesSize() < 2) { - if (!(disease == MapleDisease.SEDUCE || disease == MapleDisease.STUN)) { + if (!(disease == Disease.SEDUCE || disease == Disease.STUN)) { if (hasActiveBuff(Bishop.HOLY_SHIELD)) { return; } @@ -2652,14 +2652,14 @@ public class Character extends AbstractCharacterObject { chrLock.unlock(); } - if (disease == MapleDisease.SEDUCE && chair.get() < 0) { + if (disease == Disease.SEDUCE && chair.get() < 0) { sitChair(-1); } - final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); + final List> debuff = Collections.singletonList(new Pair<>(disease, Integer.valueOf(skill.getX()))); sendPacket(PacketCreator.giveDebuff(debuff, skill)); - if (disease != MapleDisease.SLOW) { + if (disease != Disease.SLOW) { map.broadcastMessage(this, PacketCreator.giveForeignDebuff(id, debuff, skill), false); } else { map.broadcastMessage(this, PacketCreator.giveForeignSlowDebuff(id, debuff, skill), false); @@ -2667,12 +2667,12 @@ public class Character extends AbstractCharacterObject { } } - public void dispelDebuff(MapleDisease debuff) { + public void dispelDebuff(Disease debuff) { if (hasDisease(debuff)) { long mask = debuff.getValue(); sendPacket(PacketCreator.cancelDebuff(mask)); - if (debuff != MapleDisease.SLOW) { + if (debuff != Disease.SLOW) { map.broadcastMessage(this, PacketCreator.cancelForeignDebuff(id, mask), false); } else { map.broadcastMessage(this, PacketCreator.cancelForeignSlowDebuff(id), false); @@ -2689,18 +2689,18 @@ public class Character extends AbstractCharacterObject { } public void dispelDebuffs() { - dispelDebuff(MapleDisease.CURSE); - dispelDebuff(MapleDisease.DARKNESS); - dispelDebuff(MapleDisease.POISON); - dispelDebuff(MapleDisease.SEAL); - dispelDebuff(MapleDisease.WEAKEN); - dispelDebuff(MapleDisease.SLOW); // thanks Conrad for noticing ZOMBIFY isn't dispellable + dispelDebuff(Disease.CURSE); + dispelDebuff(Disease.DARKNESS); + dispelDebuff(Disease.POISON); + dispelDebuff(Disease.SEAL); + dispelDebuff(Disease.WEAKEN); + dispelDebuff(Disease.SLOW); // thanks Conrad for noticing ZOMBIFY isn't dispellable } public void purgeDebuffs() { - dispelDebuff(MapleDisease.SEDUCE); - dispelDebuff(MapleDisease.ZOMBIFY); - dispelDebuff(MapleDisease.CONFUSE); + dispelDebuff(Disease.SEDUCE); + dispelDebuff(Disease.ZOMBIFY); + dispelDebuff(Disease.CONFUSE); dispelDebuffs(); } @@ -2815,13 +2815,13 @@ public class Character extends AbstractCharacterObject { diseaseExpireTask = TimerManager.getInstance().register(new Runnable() { @Override public void run() { - Set toExpire = new LinkedHashSet<>(); + Set toExpire = new LinkedHashSet<>(); chrLock.lock(); try { long curTime = Server.getInstance().getCurrentTime(); - for (Entry de : diseaseExpires.entrySet()) { + for (Entry de : diseaseExpires.entrySet()) { if (de.getValue() < curTime) { toExpire.add(de.getKey()); } @@ -2830,7 +2830,7 @@ public class Character extends AbstractCharacterObject { chrLock.unlock(); } - for (MapleDisease d : toExpire) { + for (Disease d : toExpire) { dispelDebuff(d); } } @@ -3052,7 +3052,7 @@ public class Character extends AbstractCharacterObject { } public void gainExp(int gain, int party, boolean show, boolean inChat, boolean white) { - if (hasDisease(MapleDisease.CURSE)) { + if (hasDisease(Disease.CURSE)) { gain *= 0.5; party *= 0.5; } @@ -7328,14 +7328,14 @@ public class Character extends AbstractCharacterObject { } // Debuffs (load) - Map> loadedDiseases = new LinkedHashMap<>(); + Map> loadedDiseases = new LinkedHashMap<>(); try (PreparedStatement ps = con.prepareStatement("SELECT * FROM playerdiseases WHERE charid = ?")) { ps.setInt(1, ret.getId()); try (ResultSet rs = ps.executeQuery()) { while (rs.next()) { - final MapleDisease disease = MapleDisease.ordinal(rs.getInt("disease")); - if (disease == MapleDisease.NULL) { + final Disease disease = Disease.ordinal(rs.getInt("disease")); + if (disease == Disease.NULL) { continue; } @@ -8106,14 +8106,14 @@ public class Character extends AbstractCharacterObject { } } - Map> listds = getAllDiseases(); + Map> listds = getAllDiseases(); if (!listds.isEmpty()) { try (Connection con = DatabaseConnection.getConnection()) { deleteWhereCharacterId(con, "DELETE FROM playerdiseases WHERE charid = ?"); try (PreparedStatement ps = con.prepareStatement("INSERT INTO playerdiseases (charid, disease, mobskillid, mobskilllv, length) VALUES (?, ?, ?, ?, ?)")) { ps.setInt(1, getId()); - for (Entry> e : listds.entrySet()) { + for (Entry> e : listds.entrySet()) { ps.setInt(2, e.getKey().ordinal()); MobSkill ms = e.getValue().getRight(); @@ -9085,7 +9085,7 @@ public class Character extends AbstractCharacterObject { } public boolean applyHpMpChange(int hpCon, int hpchange, int mpchange) { - boolean zombify = hasDisease(MapleDisease.ZOMBIFY); + boolean zombify = hasDisease(Disease.ZOMBIFY); effLock.lock(); statWlock.lock(); diff --git a/src/main/java/client/MapleDisease.java b/src/main/java/client/Disease.java similarity index 76% rename from src/main/java/client/MapleDisease.java rename to src/main/java/client/Disease.java index 4dd866f050..6e8d4ec7be 100644 --- a/src/main/java/client/MapleDisease.java +++ b/src/main/java/client/Disease.java @@ -23,7 +23,7 @@ package client; import constants.game.GameConstants; -public enum MapleDisease { +public enum Disease { NULL(0x0), SLOW(0x1, 126), SEDUCE(0x80, 128), @@ -36,25 +36,25 @@ public enum MapleDisease { DARKNESS(0x10000000000000L, 121), WEAKEN(0x4000000000000000L, 122), CURSE(0x8000000000000000L, 124); - - private long i; - private boolean first; - private int mobskill; - - private MapleDisease(long i) { + + private final long i; + private final boolean first; + private final int mobskill; + + Disease(long i) { this(i, false, 0); } - private MapleDisease(long i, int skill) { + Disease(long i, int skill) { this(i, false, skill); } - - private MapleDisease(long i, boolean first, int skill) { + + Disease(long i, boolean first, int skill) { this.i = i; this.first = first; this.mobskill = skill; } - + public long getValue() { return i; } @@ -62,31 +62,31 @@ public enum MapleDisease { public boolean isFirst() { return first; } - + public int getDisease() { return mobskill; } - - public static MapleDisease ordinal(int ord) { + + public static Disease ordinal(int ord) { try { - return MapleDisease.values()[ord]; + return Disease.values()[ord]; } catch (IndexOutOfBoundsException io) { return NULL; } } - - public static final MapleDisease getRandom() { - MapleDisease[] diseases = GameConstants.CPQ_DISEASES; + + public static final Disease getRandom() { + Disease[] diseases = GameConstants.CPQ_DISEASES; return diseases[(int) (Math.random() * diseases.length)]; } - - public static final MapleDisease getBySkill(final int skill) { - for (MapleDisease d : MapleDisease.values()) { + + public static final Disease getBySkill(final int skill) { + for (Disease d : Disease.values()) { if (d.getDisease() == skill && d.getDisease() != 0) { return d; } } return null; } - + } \ No newline at end of file diff --git a/src/main/java/client/command/commands/gm3/DebuffCommand.java b/src/main/java/client/command/commands/gm3/DebuffCommand.java index 38533e48bc..2aed7fdc05 100644 --- a/src/main/java/client/command/commands/gm3/DebuffCommand.java +++ b/src/main/java/client/command/commands/gm3/DebuffCommand.java @@ -25,7 +25,7 @@ package client.command.commands.gm3; import client.Character; import client.Client; -import client.MapleDisease; +import client.Disease; import client.command.Command; import server.life.MobSkill; import server.life.MobSkillFactory; @@ -47,57 +47,57 @@ public class DebuffCommand extends Command { return; } - MapleDisease disease = null; + Disease disease = null; MobSkill skill = null; switch (params[0].toUpperCase()) { case "SLOW": - disease = MapleDisease.SLOW; + disease = Disease.SLOW; skill = MobSkillFactory.getMobSkill(126, 7); break; case "SEDUCE": - disease = MapleDisease.SEDUCE; + disease = Disease.SEDUCE; skill = MobSkillFactory.getMobSkill(128, 7); break; case "ZOMBIFY": - disease = MapleDisease.ZOMBIFY; + disease = Disease.ZOMBIFY; skill = MobSkillFactory.getMobSkill(133, 1); break; case "CONFUSE": - disease = MapleDisease.CONFUSE; + disease = Disease.CONFUSE; skill = MobSkillFactory.getMobSkill(132, 2); break; case "STUN": - disease = MapleDisease.STUN; + disease = Disease.STUN; skill = MobSkillFactory.getMobSkill(123, 7); break; case "POISON": - disease = MapleDisease.POISON; + disease = Disease.POISON; skill = MobSkillFactory.getMobSkill(125, 5); break; case "SEAL": - disease = MapleDisease.SEAL; + disease = Disease.SEAL; skill = MobSkillFactory.getMobSkill(120, 1); break; case "DARKNESS": - disease = MapleDisease.DARKNESS; + disease = Disease.DARKNESS; skill = MobSkillFactory.getMobSkill(121, 1); break; case "WEAKEN": - disease = MapleDisease.WEAKEN; + disease = Disease.WEAKEN; skill = MobSkillFactory.getMobSkill(122, 1); break; case "CURSE": - disease = MapleDisease.CURSE; + disease = Disease.CURSE; skill = MobSkillFactory.getMobSkill(124, 1); break; } diff --git a/src/main/java/constants/game/GameConstants.java b/src/main/java/constants/game/GameConstants.java index d24c2a8db4..8cd1da78be 100644 --- a/src/main/java/constants/game/GameConstants.java +++ b/src/main/java/constants/game/GameConstants.java @@ -1,6 +1,6 @@ package constants.game; -import client.MapleDisease; +import client.Disease; import client.MapleJob; import config.YamlConfig; import constants.skills.Aran; @@ -35,8 +35,8 @@ public class GameConstants { private final static NumberFormat nfFormatter = new DecimalFormat("#,###,###,###"); private final static NumberFormat nfParser = NumberFormat.getInstance(YamlConfig.config.server.USE_UNITPRICE_WITH_COMMA ? Locale.FRANCE : Locale.UK); - public static final MapleDisease[] CPQ_DISEASES = {MapleDisease.SLOW, MapleDisease.SEDUCE, MapleDisease.STUN, MapleDisease.POISON, - MapleDisease.SEAL, MapleDisease.DARKNESS, MapleDisease.WEAKEN, MapleDisease.CURSE}; + public static final Disease[] CPQ_DISEASES = {Disease.SLOW, Disease.SEDUCE, Disease.STUN, Disease.POISON, + Disease.SEAL, Disease.DARKNESS, Disease.WEAKEN, Disease.CURSE}; public static final int MAX_FIELD_MOB_DAMAGE = getMaxObstacleMobDamageFromWz() * 2; diff --git a/src/main/java/net/server/PlayerBuffStorage.java b/src/main/java/net/server/PlayerBuffStorage.java index c936c98898..f04deff6e9 100644 --- a/src/main/java/net/server/PlayerBuffStorage.java +++ b/src/main/java/net/server/PlayerBuffStorage.java @@ -21,15 +21,16 @@ */ package net.server; -import client.MapleDisease; +import client.Disease; +import net.server.audit.locks.MonitoredLockType; +import net.server.audit.locks.factory.MonitoredReentrantLockFactory; +import server.life.MobSkill; +import tools.Pair; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.locks.Lock; -import server.life.MobSkill; -import tools.Pair; -import net.server.audit.locks.MonitoredLockType; -import net.server.audit.locks.factory.MonitoredReentrantLockFactory; /** * @@ -40,7 +41,7 @@ public class PlayerBuffStorage { private int id = (int) (Math.random() * 100); private final Lock lock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.BUFF_STORAGE, true); private Map> buffs = new HashMap<>(); - private Map>> diseases = new HashMap<>(); + private Map>> diseases = new HashMap<>(); public void addBuffsToStorage(int chrid, List toStore) { lock.lock(); @@ -60,7 +61,7 @@ public class PlayerBuffStorage { } } - public void addDiseasesToStorage(int chrid, Map> toStore) { + public void addDiseasesToStorage(int chrid, Map> toStore) { lock.lock(); try { diseases.put(chrid, toStore); @@ -69,7 +70,7 @@ public class PlayerBuffStorage { } } - public Map> getDiseasesFromStorage(int chrid) { + public Map> getDiseasesFromStorage(int chrid) { lock.lock(); try { return diseases.remove(chrid); diff --git a/src/main/java/net/server/PlayerDiseaseValueHolder.java b/src/main/java/net/server/PlayerDiseaseValueHolder.java index 8b125825c1..d30a9b627f 100644 --- a/src/main/java/net/server/PlayerDiseaseValueHolder.java +++ b/src/main/java/net/server/PlayerDiseaseValueHolder.java @@ -20,15 +20,15 @@ */ package net.server; -import client.MapleDisease; +import client.Disease; public class PlayerDiseaseValueHolder {//Thanks Celino public long startTime; public long length; - public MapleDisease disease; + public Disease disease; - public PlayerDiseaseValueHolder(final MapleDisease disease, final long startTime, final long length) { + public PlayerDiseaseValueHolder(final Disease disease, final long startTime, final long length) { this.disease = disease; this.startTime = startTime; this.length = length; diff --git a/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java b/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java index 719887d39a..19dfaa8c85 100644 --- a/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java +++ b/src/main/java/net/server/channel/handlers/CancelDebuffHandler.java @@ -29,16 +29,16 @@ public final class CancelDebuffHandler extends AbstractPacketHandler {//TIP: BAD @Override public final void handlePacket(InPacket p, Client c) { - /*List diseases = c.getPlayer().getDiseases(); - List diseases_ = new ArrayList(); - for (MapleDisease disease : diseases) { - List disease_ = new ArrayList(); + /*List diseases = c.getPlayer().getDiseases(); + List diseases_ = new ArrayList(); + for (Disease disease : diseases) { + List disease_ = new ArrayList(); disease_.add(disease); diseases_.add(disease); c.sendPacket(PacketCreator.cancelDebuff(disease_)); c.getPlayer().getMap().broadcastMessage(c.getPlayer(), PacketCreator.cancelForeignDebuff(c.getPlayer().getId(), disease_), false); } - for (MapleDisease disease : diseases_) { + for (Disease disease : diseases_) { c.getPlayer().removeDisease(disease); }*/ } diff --git a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java index 9988b42a24..674d433c10 100644 --- a/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java +++ b/src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.Character; import client.Client; -import client.MapleDisease; +import client.Disease; import net.AbstractPacketHandler; import net.packet.InPacket; import net.server.world.MapleParty; @@ -99,7 +99,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler { c.sendPacket(PacketCreator.enableActions()); return; } - final MapleDisease dis = skill.getDisease(); + final Disease dis = skill.getDisease(); MapleParty enemies = c.getPlayer().getParty().getEnemy(); if (skill.targetsAll) { int hitChance = 0; diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index 766130676a..ab8a4fc322 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -210,7 +210,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { player.silentGiveBuffs(timedBuffs); } - Map> diseases = server.getPlayerBuffStorage().getDiseasesFromStorage(cid); + Map> diseases = server.getPlayerBuffStorage().getDiseasesFromStorage(cid); if (diseases != null) { player.silentApplyDiseases(diseases); } @@ -362,8 +362,8 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler { } if (diseases != null) { - for (Entry> e : diseases.entrySet()) { - final List> debuff = Collections.singletonList(new Pair<>(e.getKey(), e.getValue().getRight().getX())); + for (Entry> e : diseases.entrySet()) { + final List> debuff = Collections.singletonList(new Pair<>(e.getKey(), e.getValue().getRight().getX())); c.sendPacket(PacketCreator.giveDebuff(debuff, e.getValue().getRight())); } } diff --git a/src/main/java/net/server/channel/handlers/UseItemHandler.java b/src/main/java/net/server/channel/handlers/UseItemHandler.java index 1348a8b650..01a86e22b0 100644 --- a/src/main/java/net/server/channel/handlers/UseItemHandler.java +++ b/src/main/java/net/server/channel/handlers/UseItemHandler.java @@ -23,7 +23,7 @@ package net.server.channel.handlers; import client.Character; import client.Client; -import client.MapleDisease; +import client.Disease; import client.inventory.InventoryType; import client.inventory.Item; import client.inventory.manipulator.InventoryManipulator; @@ -58,17 +58,17 @@ public final class UseItemHandler extends AbstractPacketHandler { remove(c, slot); return; } else if (itemId == 2050001) { - chr.dispelDebuff(MapleDisease.DARKNESS); + chr.dispelDebuff(Disease.DARKNESS); remove(c, slot); return; } else if (itemId == 2050002) { - chr.dispelDebuff(MapleDisease.WEAKEN); - chr.dispelDebuff(MapleDisease.SLOW); + chr.dispelDebuff(Disease.WEAKEN); + chr.dispelDebuff(Disease.SLOW); remove(c, slot); return; } else if (itemId == 2050003) { - chr.dispelDebuff(MapleDisease.SEAL); - chr.dispelDebuff(MapleDisease.CURSE); + chr.dispelDebuff(Disease.SEAL); + chr.dispelDebuff(Disease.CURSE); remove(c, slot); return; } else if (ItemConstants.isTownScroll(itemId)) { diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index 0a55b390e4..c6b5ac25a6 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -70,7 +70,7 @@ public class MapleStatEffect { private int sourceid; private int moveTo; private int cp, nuffSkill; - private List cureDebuffs; + private List cureDebuffs; private boolean skill; private List> statups; private Map monsterStatus; @@ -183,22 +183,22 @@ public class MapleStatEffect { ret.prop = iprop / 100.0; ret.cp = MapleDataTool.getInt("cp", source, 0); - List cure = new ArrayList<>(5); + List cure = new ArrayList<>(5); if (MapleDataTool.getInt("poison", source, 0) > 0) { - cure.add(MapleDisease.POISON); + cure.add(Disease.POISON); } if (MapleDataTool.getInt("seal", source, 0) > 0) { - cure.add(MapleDisease.SEAL); + cure.add(Disease.SEAL); } if (MapleDataTool.getInt("darkness", source, 0) > 0) { - cure.add(MapleDisease.DARKNESS); + cure.add(Disease.DARKNESS); } if (MapleDataTool.getInt("weakness", source, 0) > 0) { - cure.add(MapleDisease.WEAKEN); - cure.add(MapleDisease.SLOW); + cure.add(Disease.WEAKEN); + cure.add(Disease.SLOW); } if (MapleDataTool.getInt("curse", source, 0) > 0) { - cure.add(MapleDisease.CURSE); + cure.add(Disease.CURSE); } ret.cureDebuffs = cure; ret.nuffSkill = MapleDataTool.getInt("nuffSkill", source, 0); @@ -1038,7 +1038,7 @@ public class MapleStatEffect { } else if (nuffSkill != 0 && applyto.getParty() != null && applyto.getMap().isCPQMap()) { // added by Drago (Dragohe4rt) final MCSkill skill = MapleCarnivalFactory.getInstance().getSkill(nuffSkill); if (skill != null) { - final MapleDisease dis = skill.getDisease(); + final Disease dis = skill.getDisease(); MapleParty opposition = applyfrom.getParty().getEnemy(); if (skill.targetsAll) { for (MaplePartyCharacter enemyChrs : opposition.getPartyMembers()) { @@ -1065,12 +1065,12 @@ public class MapleStatEffect { } } } else if (cureDebuffs.size() > 0) { // added by Drago (Dragohe4rt) - for (final MapleDisease debuff : cureDebuffs) { + for (final Disease debuff : cureDebuffs) { applyfrom.dispelDebuff(debuff); } } else if (mobSkill > 0 && mobSkillLevel > 0) { MobSkill ms = MobSkillFactory.getMobSkill(mobSkill, mobSkillLevel); - MapleDisease dis = MapleDisease.getBySkill(mobSkill); + Disease dis = Disease.getBySkill(mobSkill); if (target > 0) { for (Character chr : applyto.getMap().getAllPlayers()) { @@ -1347,20 +1347,20 @@ public class MapleStatEffect { } else { hpchange += hp; } - if (applyfrom.hasDisease(MapleDisease.ZOMBIFY)) { + if (applyfrom.hasDisease(Disease.ZOMBIFY)) { hpchange /= 2; } } else { // assumption: this is heal float hpHeal = (applyfrom.getCurrentMaxHp() * (float) hp / (100.0f * affectedPlayers)); hpchange += hpHeal; - if (applyfrom.hasDisease(MapleDisease.ZOMBIFY)) { + if (applyfrom.hasDisease(Disease.ZOMBIFY)) { hpchange = -hpchange; hpCon = 0; } } } if (hpR != 0) { - hpchange += (int) (applyfrom.getCurrentMaxHp() * hpR) / (applyfrom.hasDisease(MapleDisease.ZOMBIFY) ? 2 : 1); + hpchange += (int) (applyfrom.getCurrentMaxHp() * hpR) / (applyfrom.hasDisease(Disease.ZOMBIFY) ? 2 : 1); } if (primary) { if (hpCon != 0) { diff --git a/src/main/java/server/life/MobSkill.java b/src/main/java/server/life/MobSkill.java index debf3713ab..c2c11135d1 100644 --- a/src/main/java/server/life/MobSkill.java +++ b/src/main/java/server/life/MobSkill.java @@ -22,7 +22,7 @@ package server.life; import client.Character; -import client.MapleDisease; +import client.Disease; import client.status.MonsterStatus; import constants.game.GameConstants; import net.server.services.task.channel.OverallService; @@ -118,7 +118,7 @@ public class MobSkill { } public void applyEffect(Character player, MapleMonster monster, boolean skill, List banishPlayers) { - MapleDisease disease = null; + Disease disease = null; Map stats = new ArrayMap<>(); List reflection = new LinkedList<>(); switch (skillId) { @@ -154,25 +154,25 @@ public class MobSkill { } break; case 120: - disease = MapleDisease.SEAL; + disease = Disease.SEAL; break; case 121: - disease = MapleDisease.DARKNESS; + disease = Disease.DARKNESS; break; case 122: - disease = MapleDisease.WEAKEN; + disease = Disease.WEAKEN; break; case 123: - disease = MapleDisease.STUN; + disease = Disease.STUN; break; case 124: - disease = MapleDisease.CURSE; + disease = Disease.CURSE; break; case 125: - disease = MapleDisease.POISON; + disease = Disease.POISON; break; case 126: // Slow - disease = MapleDisease.SLOW; + disease = Disease.SLOW; break; case 127: if (lt != null && rb != null && skill) { @@ -184,7 +184,7 @@ public class MobSkill { } break; case 128: // Seduce - disease = MapleDisease.SEDUCE; + disease = Disease.SEDUCE; break; case 129: // Banish if (lt != null && rb != null && skill) { @@ -197,10 +197,10 @@ public class MobSkill { monster.getMap().spawnMist(new MapleMist(calculateBoundingBox(monster.getPosition()), monster, this), x * 100, false, false, false); break; case 132: - disease = MapleDisease.CONFUSE; + disease = Disease.CONFUSE; break; case 133: // zombify - disease = MapleDisease.ZOMBIFY; + disease = Disease.ZOMBIFY; break; case 140: if (makeChanceResult() && !monster.isBuffed(MonsterStatus.MAGIC_IMMUNITY)) { @@ -329,9 +329,9 @@ public class MobSkill { int i = 0; for (Character character : getPlayersInRange(monster)) { if (!character.hasActiveBuff(2321005)) { // holy shield - if (disease.equals(MapleDisease.SEDUCE)) { + if (disease.equals(Disease.SEDUCE)) { if (i < count) { - character.giveDebuff(MapleDisease.SEDUCE, this); + character.giveDebuff(Disease.SEDUCE, this); i++; } } else { diff --git a/src/main/java/server/partyquest/MapleCarnivalFactory.java b/src/main/java/server/partyquest/MapleCarnivalFactory.java index d5556dd0b7..9992b160b0 100644 --- a/src/main/java/server/partyquest/MapleCarnivalFactory.java +++ b/src/main/java/server/partyquest/MapleCarnivalFactory.java @@ -1,6 +1,6 @@ package server.partyquest; -import client.MapleDisease; +import client.Disease; import provider.MapleData; import provider.MapleDataProvider; import provider.MapleDataProviderFactory; @@ -97,8 +97,8 @@ public class MapleCarnivalFactory { return MobSkillFactory.getMobSkill(skillid, level); } - public MapleDisease getDisease() { - return MapleDisease.getBySkill(skillid); + public Disease getDisease() { + return Disease.getBySkill(skillid); } } } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 360630db24..775a11f078 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -2895,10 +2895,10 @@ public class PacketCreator { return p; } - private static void writeLongMaskD(final OutPacket p, List> statups) { + private static void writeLongMaskD(final OutPacket p, List> statups) { long firstmask = 0; long secondmask = 0; - for (Pair statup : statups) { + for (Pair statup : statups) { if (statup.getLeft().isFirst()) { firstmask |= statup.getLeft().getValue(); } else { @@ -2909,10 +2909,10 @@ public class PacketCreator { p.writeLong(secondmask); } - public static Packet giveDebuff(List> statups, MobSkill skill) { + public static Packet giveDebuff(List> statups, MobSkill skill) { final OutPacket p = OutPacket.create(SendOpcode.GIVE_BUFF); writeLongMaskD(p, statups); - for (Pair statup : statups) { + for (Pair statup : statups) { p.writeShort(statup.getRight().shortValue()); p.writeShort(skill.getSkillId()); p.writeShort(skill.getSkillLevel()); @@ -2924,13 +2924,13 @@ public class PacketCreator { return p; } - public static Packet giveForeignDebuff(int chrId, List> statups, MobSkill skill) { + public static Packet giveForeignDebuff(int chrId, List> statups, MobSkill skill) { // Poison damage visibility and missing diseases status visibility, extended through map transitions thanks to Ronan OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); p.writeInt(chrId); writeLongMaskD(p, statups); - for (Pair statup : statups) { - if (statup.getLeft() == MapleDisease.POISON) { + for (Pair statup : statups) { + if (statup.getLeft() == Disease.POISON) { p.writeShort(statup.getRight().shortValue()); } p.writeShort(skill.getSkillId()); @@ -3040,12 +3040,12 @@ public class PacketCreator { p.writeLong(0); } - public static Packet giveForeignSlowDebuff(int chrId, List> statups, MobSkill skill) { + public static Packet giveForeignSlowDebuff(int chrId, List> statups, MobSkill skill) { OutPacket p = OutPacket.create(SendOpcode.GIVE_FOREIGN_BUFF); p.writeInt(chrId); writeLongMaskSlowD(p); - for (Pair statup : statups) { - if (statup.getLeft() == MapleDisease.POISON) { + for (Pair statup : statups) { + if (statup.getLeft() == Disease.POISON) { p.writeShort(statup.getRight().shortValue()); } p.writeShort(skill.getSkillId());