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

Proper naming for various methods and variables.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-12-26 22:17:47 +00:00
parent f5f80399c5
commit 3e61211e14
369 changed files with 1098 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/GainakUnderground/Lailly/Lailly.java vendored
View File

@@ -64,7 +64,7 @@ public class Lailly extends AbstractNpcAI
}
case "okay":
{
final Instance instance = InstanceManager.getInstance().getPlayer(player, false);
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
if ((instance != null) && (instance.getEndTime() > Chronos.currentTimeMillis()))
{
switch (instance.getTemplateId())

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/Rune/Roiental/Roiental.java vendored
View File

@@ -115,7 +115,7 @@ public class Roiental extends AbstractNpcAI
public String onFirstTalk(Npc npc, Player player)
{
String htmltext = null;
final Instance instance = InstanceManager.getInstance().getPlayer(player, false);
final Instance instance = InstanceManager.getInstance().getPlayerInstance(player, false);
if ((instance != null) && ((instance.getTemplateId() == TOH_GB_TEMPLATE_ID)))
{
htmltext = "Roiental-02a.html";

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Octavis/OctavisWarzone.java vendored
View File

@@ -138,7 +138,7 @@ public class OctavisWarzone extends AbstractInstance
}
case "reenterInstance":
{
final Instance activeInstance = getPlayer(player);
final Instance activeInstance = getPlayerInstance(player);
if (isInInstance(activeInstance))
{
enterInstance(player, npc, activeInstance.getTemplateId());

4
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Teredor/TeredorWarzone.java vendored
View File

@@ -194,9 +194,9 @@ public class TeredorWarzone extends AbstractInstance
}
case "checkConditions":
{
final Instance Player = getPlayer(player);
final Instance instance = getPlayerInstance(player);
final Party playerParty = player.getParty();
if ((Player != null) && (Player.getTemplateId() == TEMPLATE_ID))
if ((instance != null) && (instance.getTemplateId() == TEMPLATE_ID))
{
enterInstance(player, npc, TEMPLATE_ID);
}

14
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -1270,7 +1270,7 @@ public class AdminEditChar implements IAdminCommandHandler
*/
private void findCharacter(Player activeChar, String characterToFind)
{
int CharactersFound = 0;
int charactersFound = 0;
String name;
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
adminReply.setFile(activeChar, "data/html/admin/charfind.htm");
@@ -1283,7 +1283,7 @@ public class AdminEditChar implements IAdminCommandHandler
name = player.getName();
if (name.toLowerCase().contains(characterToFind.toLowerCase()))
{
CharactersFound += 1;
charactersFound += 1;
replyMSG.append("<tr><td width=80><a action=\"bypass -h admin_character_info ");
replyMSG.append(name);
replyMSG.append("\">");
@@ -1294,7 +1294,7 @@ public class AdminEditChar implements IAdminCommandHandler
replyMSG.append(player.getLevel());
replyMSG.append("</td></tr>");
}
if (CharactersFound > 20)
if (charactersFound > 20)
{
break;
}
@@ -1302,16 +1302,16 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%results%", replyMSG.toString());
final String replyMSG2;
if (CharactersFound == 0)
if (charactersFound == 0)
{
replyMSG2 = "s. Please try again.";
}
else if (CharactersFound > 20)
else if (charactersFound > 20)
{
adminReply.replace("%number%", " more than 20");
replyMSG2 = "s.<br>Please refine your search to see all of the results.";
}
else if (CharactersFound == 1)
else if (charactersFound == 1)
{
replyMSG2 = ".";
}
@@ -1320,7 +1320,7 @@ public class AdminEditChar implements IAdminCommandHandler
replyMSG2 = "s.";
}
adminReply.replace("%number%", String.valueOf(CharactersFound));
adminReply.replace("%number%", String.valueOf(charactersFound));
adminReply.replace("%end%", replyMSG2);
activeChar.sendPacket(adminReply);
}

10
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -66,9 +66,9 @@ public abstract class AbstractInstance extends AbstractNpcAI
* @param player player who wants get instance world
* @return instance world if found, otherwise null
*/
public Instance getPlayer(Player player)
public Instance getPlayerInstance(Player player)
{
return InstanceManager.getInstance().getPlayer(player, false);
return InstanceManager.getInstance().getPlayerInstance(player, false);
}
/**
@@ -107,7 +107,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
*/
protected final void enterInstance(Player player, Npc npc, int templateId)
{
Instance instance = getPlayer(player);
Instance instance = getPlayerInstance(player);
if (instance != null) // Player has already any instance active
{
if (instance.getTemplateId() != templateId)
@@ -153,9 +153,9 @@ public abstract class AbstractInstance extends AbstractNpcAI
// Check if any player from enter group has active instance
for (Player member : enterGroup)
{
if (getPlayer(member) != null)
if (getPlayerInstance(member) != null)
{
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(p.getName())));
enterGroup.forEach(p -> p.sendPacket(new SystemMessage(SystemMessageId.SINCE_C1_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_THIS_DUNGEON).addString(member.getName())));
return;
}

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/DimensionMakkum/DimensionMakkum.java vendored
View File

@@ -45,7 +45,7 @@ public class DimensionMakkum extends AbstractInstance
@Override
public String onAdvEvent(String event, Npc npc, Player player)
{
final Instance world = getPlayer(player);
final Instance world = getPlayerInstance(player);
switch (event)
{
case "enter_instance":

30
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperAdolph.java vendored
View File

@@ -159,11 +159,11 @@ public class KartiaHelperAdolph extends AbstractNpcAI
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("adolphHate");
final SkillHolder skill_02 = instParams.getSkillHolder("adolphPunish");
final SkillHolder skill_03 = instParams.getSkillHolder("adolphShield");
final SkillHolder skill_04 = instParams.getSkillHolder("adolphAggression");
final SkillHolder skill_05 = instParams.getSkillHolder("adolphChainHydra");
final SkillHolder skill1 = instParams.getSkillHolder("adolphHate");
final SkillHolder skill2 = instParams.getSkillHolder("adolphPunish");
final SkillHolder skill3 = instParams.getSkillHolder("adolphShield");
final SkillHolder skill4 = instParams.getSkillHolder("adolphAggression");
final SkillHolder skill5 = instParams.getSkillHolder("adolphChainHydra");
final SkillHolder lowHpSkill = instParams.getSkillHolder("adolphUltimate");
final int numberOfActiveSkills = 5;
final int randomSkill = getRandom(numberOfActiveSkills + 1);
@@ -183,10 +183,10 @@ public class KartiaHelperAdolph extends AbstractNpcAI
case 0:
case 1:
{
if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill()))
if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN);
npc.doCast(skill_01.getSkill(), null, true, false);
npc.doCast(skill1.getSkill(), null, true, false);
final List<Monster> monsterList = World.getInstance().getVisibleObjectsInRange(npc, Monster.class, 300);
if (!monsterList.isEmpty())
{
@@ -203,37 +203,37 @@ public class KartiaHelperAdolph extends AbstractNpcAI
}
case 2:
{
if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
npc.doCast(skill_02.getSkill(), null, true, false);
npc.doCast(skill2.getSkill(), null, true, false);
}
break;
}
case 3:
{
if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill()))
if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS);
npc.doCast(skill_03.getSkill(), null, true, false);
npc.doCast(skill3.getSkill(), null, true, false);
}
break;
}
case 4:
{
if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill()))
if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED);
npc.doCast(skill_04.getSkill());
npc.doCast(skill4.getSkill());
}
break;
}
case 5:
{
if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill()))
if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE);
npc.doCast(skill_05.getSkill(), null, true, false);
npc.doCast(skill5.getSkill(), null, true, false);
}
break;
}

30
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperBarton.java vendored
View File

@@ -174,11 +174,11 @@ public class KartiaHelperBarton extends AbstractNpcAI
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("bartonInfinity");
final SkillHolder skill_02 = instParams.getSkillHolder("bartonBerserker");
final SkillHolder skill_03 = instParams.getSkillHolder("bartonHurricane");
final SkillHolder skill_04 = instParams.getSkillHolder("bartonPowerBomber");
final SkillHolder skill_05 = instParams.getSkillHolder("bartonSonicStar");
final SkillHolder skill1 = instParams.getSkillHolder("bartonInfinity");
final SkillHolder skill2 = instParams.getSkillHolder("bartonBerserker");
final SkillHolder skill3 = instParams.getSkillHolder("bartonHurricane");
final SkillHolder skill4 = instParams.getSkillHolder("bartonPowerBomber");
final SkillHolder skill5 = instParams.getSkillHolder("bartonSonicStar");
final int numberOfActiveSkills = 5;
final int randomSkill = getRandom(numberOfActiveSkills + 1);
@@ -187,46 +187,46 @@ public class KartiaHelperBarton extends AbstractNpcAI
case 0:
case 1:
{
if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill()))
if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN);
npc.doCast(skill_01.getSkill(), null, true, false);
npc.doCast(skill1.getSkill(), null, true, false);
}
break;
}
case 2:
{
if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
npc.doCast(skill_02.getSkill(), null, true, false);
npc.doCast(skill2.getSkill(), null, true, false);
}
break;
}
case 3:
{
if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill()))
if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS);
npc.doCast(skill_03.getSkill(), null, true, false);
npc.doCast(skill3.getSkill(), null, true, false);
}
break;
}
case 4:
{
if ((skill_04 != null) && SkillCaster.checkUseConditions(npc, skill_04.getSkill()))
if ((skill4 != null) && SkillCaster.checkUseConditions(npc, skill4.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_BE_DESTROYED);
npc.doCast(skill_04.getSkill(), null, true, false);
npc.doCast(skill4.getSkill(), null, true, false);
}
break;
}
case 5:
{
if ((skill_05 != null) && SkillCaster.checkUseConditions(npc, skill_05.getSkill()))
if ((skill5 != null) && SkillCaster.checkUseConditions(npc, skill5.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_WILL_DIE);
npc.doCast(skill_05.getSkill(), null, true, false);
npc.doCast(skill5.getSkill(), null, true, false);
}
break;
}

18
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperHayuk.java vendored
View File

@@ -175,9 +175,9 @@ public class KartiaHelperHayuk extends AbstractNpcAI
if ((instance != null) && !npc.isCastingNow() && (!CommonUtil.contains(KARTIA_FRIENDS, target.getId())))
{
final StatSet instParams = instance.getTemplateParameters();
final SkillHolder skill_01 = instParams.getSkillHolder("hayukPinpointShot");
final SkillHolder skill_02 = instParams.getSkillHolder("hayukRecoilShot");
final SkillHolder skill_03 = instParams.getSkillHolder("hayukMultipleArrow");
final SkillHolder skill1 = instParams.getSkillHolder("hayukPinpointShot");
final SkillHolder skill2 = instParams.getSkillHolder("hayukRecoilShot");
final SkillHolder skill3 = instParams.getSkillHolder("hayukMultipleArrow");
final int numberOfActiveSkills = 3;
final int randomSkill = getRandom(numberOfActiveSkills + 1);
@@ -186,28 +186,28 @@ public class KartiaHelperHayuk extends AbstractNpcAI
case 0:
case 1:
{
if ((skill_01 != null) && SkillCaster.checkUseConditions(npc, skill_01.getSkill()))
if ((skill1 != null) && SkillCaster.checkUseConditions(npc, skill1.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.I_WILL_SHOW_YOU_THE_JUSTICE_OF_ADEN);
npc.doCast(skill_01.getSkill(), null, true, false);
npc.doCast(skill1.getSkill(), null, true, false);
}
break;
}
case 2:
{
if ((skill_02 != null) && SkillCaster.checkUseConditions(npc, skill_02.getSkill()))
if ((skill2 != null) && SkillCaster.checkUseConditions(npc, skill2.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED_3);
npc.doCast(skill_02.getSkill(), null, true, false);
npc.doCast(skill2.getSkill(), null, true, false);
}
break;
}
case 3:
{
if ((skill_03 != null) && SkillCaster.checkUseConditions(npc, skill_03.getSkill()))
if ((skill3 != null) && SkillCaster.checkUseConditions(npc, skill3.getSkill()))
{
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.FOR_THE_GODDESS);
npc.doCast(skill_03.getSkill(), null, true, false);
npc.doCast(skill3.getSkill(), null, true, false);
}
break;
}

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesGoldberg.java vendored
View File

@@ -76,7 +76,7 @@ public class ThroneOfHeroesGoldberg extends AbstractInstance
}
case "reenterInstance":
{
final Instance activeInstance = getPlayer(player);
final Instance activeInstance = getPlayerInstance(player);
if (isInInstance(activeInstance))
{
enterInstance(player, npc, activeInstance.getTemplateId());

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesMaryReed.java vendored
View File

@@ -77,7 +77,7 @@ public class ThroneOfHeroesMaryReed extends AbstractInstance
}
case "reenterInstance":
{
final Instance activeInstance = getPlayer(player);
final Instance activeInstance = getPlayerInstance(player);
if (isInInstance(activeInstance))
{
enterInstance(player, npc, activeInstance.getTemplateId());

2
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/ThroneOfHeroes/ThroneOfHeroesTauti.java vendored
View File

@@ -74,7 +74,7 @@ public class ThroneOfHeroesTauti extends AbstractInstance
}
case "reenterInstance":
{
final Instance activeInstance = getPlayer(player);
final Instance activeInstance = getPlayerInstance(player);
if (isInInstance(activeInstance))
{
enterInstance(player, npc, activeInstance.getTemplateId());