diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index 0894601fcb..e896e3d439 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -53,7 +53,7 @@ public final class AvantGarde extends AbstractNpcAI @Override public String onAcquireSkill(L2Npc npc, L2PcInstance player, Skill skill, AcquireSkillType type) { - if (type.equals(AcquireSkillType.TRANSFORM)) + if (type == AcquireSkillType.TRANSFORM) { showTransformSkillList(player); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java index 82e9feefb4..a7fb894d4e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java @@ -75,7 +75,7 @@ public final class OrcBarracks extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - if (killer.getRace().equals(Race.ERTHEIA) && (SPAWN_RATE > getRandom(100))) + if (killer.getRace() == Race.ERTHEIA && (SPAWN_RATE > getRandom(100))) { final int npcId = (killer.isMageClass()) ? CHERTUBA_ILLUSION : CHERTUBA_MIRAGE; showOnScreenMsg(killer, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e795fad37e..2fb0b3964c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -206,7 +206,7 @@ public final class AwakeningMaster extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { // Ertheia dual class quest final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index 383a04716e..66b7e0f8e6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -98,11 +98,11 @@ public final class Hardin extends AbstractNpcAI } if (Config.HARDIN_RETAIL_LIMITATIONS) { - if (c.equals(ClassId.TYRR_MAESTRO) && (player.getRace() != Race.DWARF)) + if (c == ClassId.TYRR_MAESTRO && (player.getRace() != Race.DWARF)) { continue; } - if (c.equals(ClassId.ISS_DOMINATOR) && (player.getRace() != Race.ORC)) + if (c == ClassId.ISS_DOMINATOR && (player.getRace() != Race.ORC)) { continue; } @@ -171,7 +171,7 @@ public final class Hardin extends AbstractNpcAI private String getHtmlMessage(L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); if ((qs != null) && (qs.getCond() >= 7) && (qs.getCond() <= 17)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 69acf53013..30cef43e0a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -88,7 +88,7 @@ public final class Trandon extends AbstractNpcAI } case "33490-12.html": { - if (player.getRace().equals(Race.ERTHEIA) || hasAllSubCertifications(player)) + if (player.getRace() == Race.ERTHEIA || hasAllSubCertifications(player)) { htmltext = "33490-15.html"; } @@ -134,7 +134,7 @@ public final class Trandon extends AbstractNpcAI } case "giveSubCertify": { - if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace().equals(Race.ERTHEIA)) + if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace() == Race.ERTHEIA) { return null; } @@ -161,7 +161,7 @@ public final class Trandon extends AbstractNpcAI } case "learnSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } @@ -178,7 +178,8 @@ public final class Trandon extends AbstractNpcAI } case "deleteSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + // TODO: Unknown html + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java index 4606a8662f..4128e456b2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java @@ -46,7 +46,7 @@ public final class WindVortex extends AbstractNpcAI if (npc.isScriptValue(0) && !npc.isDead()) { npc.setScriptValue(1); - if (attacker.getRace().equals(Race.ERTHEIA)) + if (attacker.getRace() == Race.ERTHEIA) { final int npcId = (attacker.isMageClass()) ? IMMENSE_WINDIMA : GIANT_WINDIMA; showOnScreenMsg(attacker, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 6019435834..61246983c5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -384,7 +384,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -418,7 +418,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 5d24400580..134db49783 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -530,7 +530,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((st == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId())); @@ -549,7 +549,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId())); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 95815b18d9..f7ab375c6e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -548,7 +548,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { @@ -574,7 +574,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 308411b969..160dfdad99 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -809,7 +809,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { @@ -836,7 +836,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 187b776c62..2ede5306a1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1a6463c8a4..c555ecb5b5 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 30203b6450..3ca55e3167 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index 0894601fcb..e896e3d439 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -53,7 +53,7 @@ public final class AvantGarde extends AbstractNpcAI @Override public String onAcquireSkill(L2Npc npc, L2PcInstance player, Skill skill, AcquireSkillType type) { - if (type.equals(AcquireSkillType.TRANSFORM)) + if (type == AcquireSkillType.TRANSFORM) { showTransformSkillList(player); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java index 82e9feefb4..a7fb894d4e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java @@ -75,7 +75,7 @@ public final class OrcBarracks extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - if (killer.getRace().equals(Race.ERTHEIA) && (SPAWN_RATE > getRandom(100))) + if (killer.getRace() == Race.ERTHEIA && (SPAWN_RATE > getRandom(100))) { final int npcId = (killer.isMageClass()) ? CHERTUBA_ILLUSION : CHERTUBA_MIRAGE; showOnScreenMsg(killer, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e795fad37e..2fb0b3964c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -206,7 +206,7 @@ public final class AwakeningMaster extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { // Ertheia dual class quest final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index 383a04716e..66b7e0f8e6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -98,11 +98,11 @@ public final class Hardin extends AbstractNpcAI } if (Config.HARDIN_RETAIL_LIMITATIONS) { - if (c.equals(ClassId.TYRR_MAESTRO) && (player.getRace() != Race.DWARF)) + if (c == ClassId.TYRR_MAESTRO && (player.getRace() != Race.DWARF)) { continue; } - if (c.equals(ClassId.ISS_DOMINATOR) && (player.getRace() != Race.ORC)) + if (c == ClassId.ISS_DOMINATOR && (player.getRace() != Race.ORC)) { continue; } @@ -171,7 +171,7 @@ public final class Hardin extends AbstractNpcAI private String getHtmlMessage(L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); if ((qs != null) && (qs.getCond() >= 7) && (qs.getCond() <= 17)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 69acf53013..30cef43e0a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -88,7 +88,7 @@ public final class Trandon extends AbstractNpcAI } case "33490-12.html": { - if (player.getRace().equals(Race.ERTHEIA) || hasAllSubCertifications(player)) + if (player.getRace() == Race.ERTHEIA || hasAllSubCertifications(player)) { htmltext = "33490-15.html"; } @@ -134,7 +134,7 @@ public final class Trandon extends AbstractNpcAI } case "giveSubCertify": { - if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace().equals(Race.ERTHEIA)) + if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace() == Race.ERTHEIA) { return null; } @@ -161,7 +161,7 @@ public final class Trandon extends AbstractNpcAI } case "learnSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } @@ -178,7 +178,8 @@ public final class Trandon extends AbstractNpcAI } case "deleteSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + // TODO: Unknown html + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java index 4606a8662f..4128e456b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java @@ -46,7 +46,7 @@ public final class WindVortex extends AbstractNpcAI if (npc.isScriptValue(0) && !npc.isDead()) { npc.setScriptValue(1); - if (attacker.getRace().equals(Race.ERTHEIA)) + if (attacker.getRace() == Race.ERTHEIA) { final int npcId = (attacker.isMageClass()) ? IMMENSE_WINDIMA : GIANT_WINDIMA; showOnScreenMsg(attacker, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 3af6c45a6e..05422ade24 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -384,7 +384,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -418,7 +418,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 5d24400580..134db49783 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -530,7 +530,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((st == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId())); @@ -549,7 +549,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId())); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index 95815b18d9..f7ab375c6e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -548,7 +548,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { @@ -574,7 +574,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 308411b969..160dfdad99 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -809,7 +809,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { @@ -836,7 +836,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 187b776c62..2ede5306a1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1dd9866569..47dcd5ffc7 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 3394227e4c..2135cbacae 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index 0894601fcb..e896e3d439 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -53,7 +53,7 @@ public final class AvantGarde extends AbstractNpcAI @Override public String onAcquireSkill(L2Npc npc, L2PcInstance player, Skill skill, AcquireSkillType type) { - if (type.equals(AcquireSkillType.TRANSFORM)) + if (type == AcquireSkillType.TRANSFORM) { showTransformSkillList(player); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java index 82e9feefb4..a7fb894d4e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java @@ -75,7 +75,7 @@ public final class OrcBarracks extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - if (killer.getRace().equals(Race.ERTHEIA) && (SPAWN_RATE > getRandom(100))) + if (killer.getRace() == Race.ERTHEIA && (SPAWN_RATE > getRandom(100))) { final int npcId = (killer.isMageClass()) ? CHERTUBA_ILLUSION : CHERTUBA_MIRAGE; showOnScreenMsg(killer, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e795fad37e..2fb0b3964c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -206,7 +206,7 @@ public final class AwakeningMaster extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { // Ertheia dual class quest final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index 383a04716e..66b7e0f8e6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -98,11 +98,11 @@ public final class Hardin extends AbstractNpcAI } if (Config.HARDIN_RETAIL_LIMITATIONS) { - if (c.equals(ClassId.TYRR_MAESTRO) && (player.getRace() != Race.DWARF)) + if (c == ClassId.TYRR_MAESTRO && (player.getRace() != Race.DWARF)) { continue; } - if (c.equals(ClassId.ISS_DOMINATOR) && (player.getRace() != Race.ORC)) + if (c == ClassId.ISS_DOMINATOR && (player.getRace() != Race.ORC)) { continue; } @@ -171,7 +171,7 @@ public final class Hardin extends AbstractNpcAI private String getHtmlMessage(L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); if ((qs != null) && (qs.getCond() >= 7) && (qs.getCond() <= 17)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 69acf53013..30cef43e0a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -88,7 +88,7 @@ public final class Trandon extends AbstractNpcAI } case "33490-12.html": { - if (player.getRace().equals(Race.ERTHEIA) || hasAllSubCertifications(player)) + if (player.getRace() == Race.ERTHEIA || hasAllSubCertifications(player)) { htmltext = "33490-15.html"; } @@ -134,7 +134,7 @@ public final class Trandon extends AbstractNpcAI } case "giveSubCertify": { - if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace().equals(Race.ERTHEIA)) + if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace() == Race.ERTHEIA) { return null; } @@ -161,7 +161,7 @@ public final class Trandon extends AbstractNpcAI } case "learnSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } @@ -178,7 +178,8 @@ public final class Trandon extends AbstractNpcAI } case "deleteSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + // TODO: Unknown html + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java index 4606a8662f..4128e456b2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java @@ -46,7 +46,7 @@ public final class WindVortex extends AbstractNpcAI if (npc.isScriptValue(0) && !npc.isDead()) { npc.setScriptValue(1); - if (attacker.getRace().equals(Race.ERTHEIA)) + if (attacker.getRace() == Race.ERTHEIA) { final int npcId = (attacker.isMageClass()) ? IMMENSE_WINDIMA : GIANT_WINDIMA; showOnScreenMsg(attacker, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 3af6c45a6e..05422ade24 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -384,7 +384,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -418,7 +418,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index bda1fb99ec..cf6c845fc3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -546,7 +546,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((st == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); @@ -565,7 +565,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index a0c3209ac3..da5996f50c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -548,7 +548,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { @@ -574,7 +574,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 65bc3ba919..3e1fecb8e0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -809,7 +809,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { @@ -836,7 +836,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 187b776c62..2ede5306a1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1dd9866569..47dcd5ffc7 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 3394227e4c..2135cbacae 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java index 0894601fcb..e896e3d439 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java @@ -53,7 +53,7 @@ public final class AvantGarde extends AbstractNpcAI @Override public String onAcquireSkill(L2Npc npc, L2PcInstance player, Skill skill, AcquireSkillType type) { - if (type.equals(AcquireSkillType.TRANSFORM)) + if (type == AcquireSkillType.TRANSFORM) { showTransformSkillList(player); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java index 82e9feefb4..a7fb894d4e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java @@ -75,7 +75,7 @@ public final class OrcBarracks extends AbstractNpcAI @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - if (killer.getRace().equals(Race.ERTHEIA) && (SPAWN_RATE > getRandom(100))) + if (killer.getRace() == Race.ERTHEIA && (SPAWN_RATE > getRandom(100))) { final int npcId = (killer.isMageClass()) ? CHERTUBA_ILLUSION : CHERTUBA_MIRAGE; showOnScreenMsg(killer, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e795fad37e..2fb0b3964c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -206,7 +206,7 @@ public final class AwakeningMaster extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { // Ertheia dual class quest final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java index 383a04716e..66b7e0f8e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java @@ -98,11 +98,11 @@ public final class Hardin extends AbstractNpcAI } if (Config.HARDIN_RETAIL_LIMITATIONS) { - if (c.equals(ClassId.TYRR_MAESTRO) && (player.getRace() != Race.DWARF)) + if (c == ClassId.TYRR_MAESTRO && (player.getRace() != Race.DWARF)) { continue; } - if (c.equals(ClassId.ISS_DOMINATOR) && (player.getRace() != Race.ORC)) + if (c == ClassId.ISS_DOMINATOR && (player.getRace() != Race.ORC)) { continue; } @@ -171,7 +171,7 @@ public final class Hardin extends AbstractNpcAI private String getHtmlMessage(L2PcInstance player) { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { final QuestState qs = player.getQuestState(Q10472_WindsOfFateEncroachingShadows.class.getSimpleName()); if ((qs != null) && (qs.getCond() >= 7) && (qs.getCond() <= 17)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 69acf53013..30cef43e0a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -88,7 +88,7 @@ public final class Trandon extends AbstractNpcAI } case "33490-12.html": { - if (player.getRace().equals(Race.ERTHEIA) || hasAllSubCertifications(player)) + if (player.getRace() == Race.ERTHEIA || hasAllSubCertifications(player)) { htmltext = "33490-15.html"; } @@ -134,7 +134,7 @@ public final class Trandon extends AbstractNpcAI } case "giveSubCertify": { - if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace().equals(Race.ERTHEIA)) + if ((substrings.length < 2) || !player.isSubClassActive() || player.getRace() == Race.ERTHEIA) { return null; } @@ -161,7 +161,7 @@ public final class Trandon extends AbstractNpcAI } case "learnSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } @@ -178,7 +178,8 @@ public final class Trandon extends AbstractNpcAI } case "deleteSubSkill": { - if (player.getRace().equals(Race.ERTHEIA)) + // TODO: Unknown html + if (player.getRace() == Race.ERTHEIA) { htmltext = "33490-15.html"; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java index 4606a8662f..4128e456b2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java @@ -46,7 +46,7 @@ public final class WindVortex extends AbstractNpcAI if (npc.isScriptValue(0) && !npc.isDead()) { npc.setScriptValue(1); - if (attacker.getRace().equals(Race.ERTHEIA)) + if (attacker.getRace() == Race.ERTHEIA) { final int npcId = (attacker.isMageClass()) ? IMMENSE_WINDIMA : GIANT_WINDIMA; showOnScreenMsg(attacker, NpcStringId.A_POWERFUL_MONSTER_HAS_COME_TO_FACE_YOU, ExShowScreenMessage.TOP_CENTER, 5000); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 3af6c45a6e..05422ade24 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -384,7 +384,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -418,7 +418,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index bda1fb99ec..cf6c845fc3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -546,7 +546,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((st == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); @@ -565,7 +565,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState st = getQuestState(player, false); - if ((st == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) + if ((st == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))) { showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000); player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java index a0c3209ac3..da5996f50c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java @@ -548,7 +548,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { @@ -574,7 +574,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 2dad1e5a50..ca7c518f89 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -809,7 +809,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final int oldLevel = event.getOldLevel(); final int newLevel = event.getNewLevel(); - if ((qs == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && (player.getRace() == Race.ERTHEIA) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { @@ -836,7 +836,7 @@ public final class Q10753_WindsOfFateChoices extends Quest final L2PcInstance player = event.getActiveChar(); final QuestState qs = getQuestState(player, false); - if ((qs == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) + if ((qs == null) && player.getRace() == Race.ERTHEIA && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))) { if (player.isMageClass()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index 187b776c62..2ede5306a1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1dd9866569..47dcd5ffc7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 3394227e4c..2135cbacae 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 84775d784d..12f42b5e86 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -41,7 +41,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket for (int i = 0; i < count; i++) { final int bossId = packet.readD(); - if (DBSpawnManager.getInstance().getNpcStatusId(bossId).equals(DBStatusType.ALIVE)) + if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == DBStatusType.ALIVE) { _bossIds.add(bossId); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 49d0ae214b..b1e72c7db1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -384,7 +384,7 @@ public class AdminEditChar implements IAdminCommandHandler // Sex checks. boolean sexChange = false; - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index e727579f72..59a1a06774 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -714,17 +714,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java index 4019cdcb71..02b6c9db0d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java @@ -205,7 +205,7 @@ public final class DayNightSpawnManager continue; } - if ((boss != null) && (boss.getId() == 25328) && boss.getRaidStatus().equals(RaidBossSpawnManager.StatusEnum.ALIVE)) + if ((boss != null) && (boss.getId() == 25328) && boss.getRaidStatus() == RaidBossSpawnManager.StatusEnum.ALIVE) { handleHellmans(boss, mode); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index d3ea4b1487..7cb4c51487 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -343,7 +343,7 @@ public class RaidBossSpawnManager continue; } - if (boss.getRaidStatus().equals(StatusEnum.ALIVE)) + if (boss.getRaidStatus() == StatusEnum.ALIVE) { updateStatus(boss, false); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 1f9e81e10d..5c68ac985c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -293,7 +293,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && isRandomAnimationEnabled() && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && isRandomAnimationEnabled() && getAiType() != AIType.CORPSE); } /** @@ -1579,7 +1579,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java index 08287ffdb6..1dbb8d8ffe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java @@ -464,7 +464,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance return false; } - if (oldCID.equals(newCID.getParent())) + if (oldCID == newCID.getParent()) { return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index b42c605108..a0e3fea734 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -380,7 +380,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -414,7 +414,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index f281aca77d..d7a5b7bdb5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 07f32d54a9..f9efe7081b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 30203b6450..3ca55e3167 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index b42c605108..a0e3fea734 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -380,7 +380,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -414,7 +414,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index f281aca77d..d7a5b7bdb5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 07f32d54a9..f9efe7081b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 30203b6450..3ca55e3167 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 84775d784d..12f42b5e86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -41,7 +41,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket for (int i = 0; i < count; i++) { final int bossId = packet.readD(); - if (DBSpawnManager.getInstance().getNpcStatusId(bossId).equals(DBStatusType.ALIVE)) + if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == DBStatusType.ALIVE) { _bossIds.add(bossId); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 12d03d56a3..92b06a496b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -380,7 +380,7 @@ public class AdminEditChar implements IAdminCommandHandler } // Sex checks. - if (player.getRace().equals(Race.KAMAEL)) + if (player.getRace() == Race.KAMAEL) { switch (classidval) { @@ -414,7 +414,7 @@ public class AdminEditChar implements IAdminCommandHandler } } } - if (player.getRace().equals(Race.ERTHEIA)) + if (player.getRace() == Race.ERTHEIA) { player.getAppearance().setSex(true); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index c51e3a6d38..bbb8125a22 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -46,7 +46,7 @@ public final class ModifyVital extends AbstractEffect public ModifyVital(StatsSet params) { _type = params.getEnum("type", ModifyType.class); - if (!_type.equals(ModifyType.SET)) + if (_type != ModifyType.SET) { _hp = params.getInt("hp", 0); _mp = params.getInt("mp", 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java index 5e98fa04f5..dcb47ca35b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/instances/AbstractInstance.java @@ -181,7 +181,7 @@ public abstract class AbstractInstance extends AbstractNpcAI template.applyConditionEffects(enterGroup); // Set re-enter for instances with re-enter on start - if (instance.getReenterType().equals(InstanceReenterType.ON_ENTER)) + if (instance.getReenterType() == InstanceReenterType.ON_ENTER) { instance.setReenterTime(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java index 4c73fd01a3..10efa33d19 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java @@ -718,17 +718,17 @@ public final class CastleManorManager implements IGameXmlReader, IStorable public final boolean isUnderMaintenance() { - return _mode.equals(ManorMode.MAINTENANCE); + return _mode == ManorMode.MAINTENANCE; } public final boolean isManorApproved() { - return _mode.equals(ManorMode.APPROVED); + return _mode == ManorMode.APPROVED; } public final boolean isModifiablePeriod() { - return _mode.equals(ManorMode.MODIFIABLE); + return _mode == ManorMode.MODIFIABLE; } public final String getCurrentModeName() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java index a881e85ae4..9910fbbad3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java @@ -417,7 +417,7 @@ public class DBSpawnManager continue; } - if (npc.getDBStatus().equals(DBStatusType.ALIVE)) + if (npc.getDBStatus() == DBStatusType.ALIVE) { updateStatus(npc, false); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java index f281aca77d..d7a5b7bdb5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -1149,7 +1149,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe private Attack generateAttackTargetData(L2Character target, L2Weapon weapon, WeaponType weaponType) { - final boolean isDual = WeaponType.DUAL.equals(weaponType) || WeaponType.DUALBLUNT.equals(weaponType) || WeaponType.DUALDAGGER.equals(weaponType) || WeaponType.DUALFIST.equals(weaponType); + final boolean isDual = WeaponType.DUAL == weaponType || WeaponType.DUALBLUNT == weaponType || WeaponType.DUALDAGGER == weaponType || WeaponType.DUALFIST == weaponType; final Attack attack = new Attack(this, target); boolean shotConsumed = false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 07f32d54a9..f9efe7081b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -240,7 +240,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && getAiType() != AIType.CORPSE); } /** @@ -1337,7 +1337,7 @@ public class L2Npc extends L2Character @Override public boolean isMovementDisabled() { - return super.isMovementDisabled() || !getTemplate().canMove() || getAiType().equals(AIType.CORPSE); + return super.isMovementDisabled() || !getTemplate().canMove() || getAiType() == AIType.CORPSE; } public AIType getAiType() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java index ccef54aad0..0ca6b6c469 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/Instance.java @@ -878,7 +878,7 @@ public final class Instance implements IIdentifiable, INamable public void finishInstance(int delay) { // Set re-enter for players - if (_template.getReenterType().equals(InstanceReenterType.ON_FINISH)) + if (_template.getReenterType() == InstanceReenterType.ON_FINISH) { setReenterTime(); } @@ -941,7 +941,7 @@ public final class Instance implements IIdentifiable, INamable addPlayer(player); // Set origin return location if enabled - if (_template.getExitLocationType().equals(InstanceTeleportType.ORIGIN)) + if (_template.getExitLocationType() == InstanceTeleportType.ORIGIN) { player.getVariables().set("INSTANCE_ORIGIN", player.getX() + ";" + player.getY() + ";" + player.getZ()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java index ba6f5482ad..1fbe7a4414 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/InstanceTemplate.java @@ -498,7 +498,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl } // Now remove buffs by type - if (_removeBuffType.equals(InstanceRemoveBuffType.ALL)) + if (_removeBuffType == InstanceRemoveBuffType.ALL) { for (L2Playable playable : affected) { @@ -635,7 +635,7 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // player < party < command channel for (GroupType t : GroupType.values()) { - if (!t.equals(playerGroup) && groupMaskContains(t)) + if (t != playerGroup && groupMaskContains(t)) { return t; } @@ -663,11 +663,11 @@ public class InstanceTemplate extends ListenersContainer implements IIdentifiabl // Check if player has group in which he can enter AbstractPlayerGroup pGroup = null; - if (type.equals(GroupType.PARTY)) + if (type == GroupType.PARTY) { pGroup = player.getParty(); } - else if (type.equals(GroupType.COMMAND_CHANNEL)) + else if (type == GroupType.COMMAND_CHANNEL) { pGroup = player.getCommandChannel(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index e8bed0399f..3e40a064ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -70,7 +70,7 @@ public interface ILocational */ default boolean isInFrontOf(ILocational target) { - return Position.FRONT.equals(Position.getPosition(this, target)); + return Position.FRONT == Position.getPosition(this, target); } /** @@ -79,7 +79,7 @@ public interface ILocational */ default boolean isOnSideOf(ILocational target) { - return Position.SIDE.equals(Position.getPosition(this, target)); + return Position.SIDE == Position.getPosition(this, target); } /** @@ -88,6 +88,6 @@ public interface ILocational */ default boolean isBehind(ILocational target) { - return Position.BACK.equals(Position.getPosition(this, target)); + return Position.BACK == Position.getPosition(this, target); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index c805ee421d..ba385b38a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -237,7 +237,7 @@ public class PunishmentTask implements Runnable } } - if (_type.equals(PunishmentType.CHAT_BAN) && _affect.equals(PunishmentAffect.CHARACTER)) + if (_type == PunishmentType.CHAT_BAN && _affect == PunishmentAffect.CHARACTER) { final L2PcInstance player = L2World.getInstance().getPlayer(Integer.valueOf(_key)); if (player != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index cac8ecf953..5e36edb977 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -455,6 +455,6 @@ public final class BuffInfo public boolean isAbnormalType(AbnormalType type) { - return _skill.getAbnormalType().equals(type); + return _skill.getAbnormalType() == type; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index acf454315f..10a153adb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -118,7 +118,7 @@ public interface IStatsFunction (bodypart == L2Item.SLOT_HAIRALL)) { // TODO: Item after enchant shows pDef, but scroll says mDef increase. - if (!stat.equals(Stats.PHYSICAL_DEFENCE) && !stat.equals(Stats.MAGICAL_DEFENCE)) + if (stat != Stats.PHYSICAL_DEFENCE && stat != Stats.MAGICAL_DEFENCE) { continue; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 30203b6450..3ca55e3167 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -75,7 +75,7 @@ public final class TeleportHolder */ public boolean isNoblesse() { - return _type.equals(TeleportType.NOBLES_ADENA) || _type.equals(TeleportType.NOBLES_TOKEN); + return _type == TeleportType.NOBLES_ADENA || _type == TeleportType.NOBLES_TOKEN; } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index 84775d784d..12f42b5e86 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -41,7 +41,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket for (int i = 0; i < count; i++) { final int bossId = packet.readD(); - if (DBSpawnManager.getInstance().getNpcStatusId(bossId).equals(DBStatusType.ALIVE)) + if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == DBStatusType.ALIVE) { _bossIds.add(bossId); }