From 4cb15ab99dfc4d82292aebc6e92c0497d4735803 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 22:34:30 +0200 Subject: [PATCH] Rename and clean up MapleMist --- src/main/java/server/MapleStatEffect.java | 2 +- src/main/java/server/life/MobSkill.java | 4 ++-- src/main/java/server/maps/MapleMap.java | 2 +- .../server/maps/{MapleMist.java => Mist.java} | 23 ++++++++++--------- src/main/java/tools/PacketCreator.java | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) rename src/main/java/server/maps/{MapleMist.java => Mist.java} (91%) diff --git a/src/main/java/server/MapleStatEffect.java b/src/main/java/server/MapleStatEffect.java index 8a3f01a45b..b45736b930 100644 --- a/src/main/java/server/MapleStatEffect.java +++ b/src/main/java/server/MapleStatEffect.java @@ -1029,7 +1029,7 @@ public class MapleStatEffect { } } else if (isMist()) { Rectangle bounds = calculateBoundingBox(sourceid == NightWalker.POISON_BOMB ? pos : applyfrom.getPosition(), applyfrom.isFacingLeft()); - MapleMist mist = new MapleMist(bounds, applyfrom, this); + Mist mist = new Mist(bounds, applyfrom, this); applyfrom.getMap().spawnMist(mist, getDuration(), mist.isPoisonMist(), false, mist.isRecoveryMist()); } else if (isTimeLeap()) { applyto.removeAllCooldownsExcept(Buccaneer.TIME_LEAP, true); diff --git a/src/main/java/server/life/MobSkill.java b/src/main/java/server/life/MobSkill.java index a9f17aaf67..3202313af8 100644 --- a/src/main/java/server/life/MobSkill.java +++ b/src/main/java/server/life/MobSkill.java @@ -30,7 +30,7 @@ import net.server.services.type.ChannelServices; import server.maps.MapObject; import server.maps.MapObjectType; import server.maps.MapleMap; -import server.maps.MapleMist; +import server.maps.Mist; import tools.ArrayMap; import tools.Randomizer; @@ -194,7 +194,7 @@ public class MobSkill { } break; case 131: // Mist - monster.getMap().spawnMist(new MapleMist(calculateBoundingBox(monster.getPosition()), monster, this), x * 100, false, false, false); + monster.getMap().spawnMist(new Mist(calculateBoundingBox(monster.getPosition()), monster, this), x * 100, false, false, false); break; case 132: disease = Disease.CONFUSE; diff --git a/src/main/java/server/maps/MapleMap.java b/src/main/java/server/maps/MapleMap.java index cac95e97d2..ef3f99e5c5 100644 --- a/src/main/java/server/maps/MapleMap.java +++ b/src/main/java/server/maps/MapleMap.java @@ -2069,7 +2069,7 @@ public class MapleMap { }, null); } - public void spawnMist(final MapleMist mist, final int duration, boolean poison, boolean fake, boolean recovery) { + public void spawnMist(final Mist mist, final int duration, boolean poison, boolean fake, boolean recovery) { addMapObject(mist); broadcastMessage(fake ? mist.makeFakeSpawnData(30) : mist.makeSpawnData()); TimerManager tMan = TimerManager.getInstance(); diff --git a/src/main/java/server/maps/MapleMist.java b/src/main/java/server/maps/Mist.java similarity index 91% rename from src/main/java/server/maps/MapleMist.java rename to src/main/java/server/maps/Mist.java index e1d79ad103..8492216918 100644 --- a/src/main/java/server/maps/MapleMist.java +++ b/src/main/java/server/maps/Mist.java @@ -35,19 +35,20 @@ import tools.PacketCreator; import java.awt.*; /** - * * @author LaiLaiNoob */ -public class MapleMist extends AbstractMapObject { - private Rectangle mistPosition; +public class Mist extends AbstractMapObject { + private final Rectangle mistPosition; private Character owner = null; private Monster mob = null; private MapleStatEffect source; private MobSkill skill; - private boolean isMobMist, isPoisonMist, isRecoveryMist; - private int skillDelay; + private final boolean isMobMist; + private boolean isPoisonMist; + private boolean isRecoveryMist; + private final int skillDelay; - public MapleMist(Rectangle mistPosition, Monster mob, MobSkill skill) { + public Mist(Rectangle mistPosition, Monster mob, MobSkill skill) { this.mistPosition = mistPosition; this.mob = mob; this.skill = skill; @@ -57,7 +58,7 @@ public class MapleMist extends AbstractMapObject { skillDelay = 0; } - public MapleMist(Rectangle mistPosition, Character owner, MapleStatEffect source) { + public Mist(Rectangle mistPosition, Character owner, MapleStatEffect source) { this.mistPosition = mistPosition; this.owner = owner; this.source = source; @@ -69,11 +70,11 @@ public class MapleMist extends AbstractMapObject { case Evan.RECOVERY_AURA: isRecoveryMist = true; break; - + case Shadower.SMOKE_SCREEN: // Smoke Screen isPoisonMist = false; break; - + case FPMage.POISON_MIST: // FP mist case BlazeWizard.FLAME_GEAR: // Flame Gear case NightWalker.POISON_BOMB: // Poison Bomb @@ -105,9 +106,9 @@ public class MapleMist extends AbstractMapObject { } public boolean isRecoveryMist() { - return isRecoveryMist; + return isRecoveryMist; } - + public int getSkillDelay() { return skillDelay; } diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java index 50b7ac8764..25d2f0da47 100644 --- a/src/main/java/tools/PacketCreator.java +++ b/src/main/java/tools/PacketCreator.java @@ -3981,7 +3981,7 @@ public class PacketCreator { return p; } - public static Packet spawnMist(int objId, int ownerChrId, int skill, int level, MapleMist mist) { + public static Packet spawnMist(int objId, int ownerChrId, int skill, int level, Mist mist) { OutPacket p = OutPacket.create(SendOpcode.SPAWN_MIST); p.writeInt(objId); p.writeInt(mist.isMobMist() ? 0 : mist.isPoisonMist() ? 1 : mist.isRecoveryMist() ? 4 : 2); // mob mist = 0, player poison = 1, smokescreen = 2, unknown = 3, recovery = 4