lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced equals() on enum constants.

Browse Source
This commit is contained in:
MobiusDev
2018-09-09 18:41:22 +00:00
parent 31dadef4b8
commit dce4f54d60
143 changed files with 252 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IvoryTower/AvantGarde/AvantGarde.java vendored
View File

@@ -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);
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/OrcBarracks/OrcBarracks.java vendored
View File

@@ -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);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -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());

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java vendored
View File

@@ -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))

9
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java vendored
View File

@@ -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";
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/WindyHill/WindVortex.java vendored
View File

@@ -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);

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -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);
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java vendored
View File

@@ -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);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -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();
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java vendored
View File

@@ -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));

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10752_WindsOfFateAPromise/Q10752_WindsOfFateAPromise.java vendored
View File

@@ -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())
{

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java vendored
View File

@@ -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())
{