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

Minor code improvements.

Browse Source
This commit is contained in:
MobiusDev
2017-08-29 23:02:08 +00:00
parent 9be051a70f
commit 224f9331f7
130 changed files with 403 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java vendored
View File

@@ -471,7 +471,7 @@ public final class FeedableBeasts extends AbstractNpcAI
if (MAD_COW_POLYMORPH.containsKey(nextNpcId))
{
this.startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player);
startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player);
}
// register the player in the feedinfo for the mob that just spawned

18
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java vendored
View File

@@ -32,17 +32,17 @@ import ai.AbstractNpcAI;
public final class LairOfAntharas extends AbstractNpcAI
{
// NPC
final private static int KNORIKS = 22857;
final private static int DRAGON_KNIGHT = 22844;
final private static int DRAGON_KNIGHT2 = 22845;
final private static int ELITE_DRAGON_KNIGHT = 22846;
private static final int KNORIKS = 22857;
private static final int DRAGON_KNIGHT = 22844;
private static final int DRAGON_KNIGHT2 = 22845;
private static final int ELITE_DRAGON_KNIGHT = 22846;
final private static int DRAGON_GUARD = 22852;
final private static int DRAGON_MAGE = 22853;
private static final int DRAGON_GUARD = 22852;
private static final int DRAGON_MAGE = 22853;
// Misc
final private static int KNIGHT_CHANCE = 30;
final private static int KNORIKS_CHANCE = 60;
final private static int KNORIKS_CHANCE2 = 50;
private static final int KNIGHT_CHANCE = 30;
private static final int KNORIKS_CHANCE = 60;
private static final int KNORIKS_CHANCE2 = 50;
private LairOfAntharas()
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java vendored
View File

@@ -246,7 +246,7 @@ public final class Orfen extends AbstractNpcAI
if ((skill.getEffectPoint() > 0) && (getRandom(5) == 0) && npc.isInsideRadius(originalCaster, 1000, false, false))
{
final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), TEXT[getRandom(4)]);
packet.addStringParameter(caster.getName().toString());
packet.addStringParameter(caster.getName());
npc.broadcastPacket(packet);
originalCaster.teleToLocation(npc.getLocation());
npc.setTarget(originalCaster);
@@ -301,7 +301,7 @@ public final class Orfen extends AbstractNpcAI
else if (npc.isInsideRadius(attacker, 1000, false, false) && !npc.isInsideRadius(attacker, 300, false, false) && (getRandom(10) == 0))
{
final NpcSay packet = new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npcId, TEXT[getRandom(3)]);
packet.addStringParameter(attacker.getName().toString());
packet.addStringParameter(attacker.getName());
npc.broadcastPacket(packet);
attacker.teleToLocation(npc.getLocation());
npc.setTarget(attacker);

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java vendored
View File

@@ -114,7 +114,7 @@ public final class CastleAmbassador extends AbstractNpcAI
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
packet.replace("%castleName%", String.valueOf(fortresss.getCastleByAmbassador(npc.getId()).getName()));
packet.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
player.sendPacket(packet);
}
}
@@ -149,7 +149,7 @@ public final class CastleAmbassador extends AbstractNpcAI
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
packet.setHtml(getHtm(player.getHtmlPrefix(), htmltext));
packet.replace("%castleName%", String.valueOf(fortresss.getCastleByAmbassador(npc.getId()).getName()));
packet.replace("%castleName%", fortresss.getCastleByAmbassador(npc.getId()).getName());
player.sendPacket(packet);
return null;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -1208,8 +1208,8 @@ public final class CastleChamberlain extends AbstractNpcAI
else
{
final NpcHtmlMessage html = getHtmlPacket(player, npc, "chamberlain-25.html");
html.replace("%owner_name%", String.valueOf(player.getName()));
html.replace("%feud_name%", String.valueOf(String.valueOf(1001000 + castle.getResidenceId())));
html.replace("%owner_name%", player.getName());
html.replace("%feud_name%", String.valueOf(1001000 + castle.getResidenceId()));
player.sendPacket(html);
giveItems(player, CROWN, 1);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java vendored
View File

@@ -193,7 +193,7 @@ public final class SubclassCertification extends AbstractNpcAI
String htmltext = getHtm(player.getHtmlPrefix(), htmlFile);
if (replaceClass)
{
htmltext = htmltext.replace("%class%", String.valueOf(ClassListData.getInstance().getClass(player.getActiveClass()).getClientCode()));
htmltext = htmltext.replace("%class%", ClassListData.getInstance().getClass(player.getActiveClass()).getClientCode());
}
if (levelToReplace != null)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java vendored
View File

@@ -31,7 +31,7 @@ public final class HuntingGroundsTeleport extends AbstractNpcAI
{
// NPCs
// @formatter:off
private final static int[] PRIESTS =
private static final int[] PRIESTS =
{
31078, 31079, 31080, 31081, 31082, 31083, 31084, 31085, 31086, 31087,
31088, 31089, 31090, 31091, 31168, 31169, 31692, 31693, 31694, 31695,

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java vendored
View File

@@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
public final class MithrilMinesTeleporter extends AbstractNpcAI
{
// NPC
private final static int TELEPORT_CRYSTAL = 32652;
private static final int TELEPORT_CRYSTAL = 32652;
// Location
private static final Location[] LOCS =
{

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java vendored
View File

@@ -35,27 +35,27 @@ import ai.AbstractNpcAI;
public final class OracleTeleport extends AbstractNpcAI
{
// @formatter:off
private final static int[] TOWN_DAWN =
private static final int[] TOWN_DAWN =
{
31078, 31079, 31080, 31081, 31083, 31084, 31082, 31692, 31694, 31997, 31168
};
private final static int[] TOWN_DUSK =
private static final int[] TOWN_DUSK =
{
31085, 31086, 31087, 31088, 31090, 31091, 31089, 31693, 31695, 31998, 31169
};
private final static int[] TEMPLE_PRIEST =
private static final int[] TEMPLE_PRIEST =
{
31127, 31128, 31129, 31130, 31131, 31137, 31138, 31139, 31140, 31141
};
private final static int[] RIFT_POSTERS =
private static final int[] RIFT_POSTERS =
{
31488, 31489, 31490, 31491, 31492, 31493
};
private final static int[] TELEPORTERS =
private static final int[] TELEPORTERS =
{
31078, 31079, 31080, 31081, 31082, 31083, 31084, 31692, 31694, 31997,
31168, 31085, 31086, 31087, 31088, 31089, 31090, 31091, 31693, 31695,
@@ -66,7 +66,7 @@ public final class OracleTeleport extends AbstractNpcAI
31122, 31123, 31124, 31125
};
// @formatter:on
private final static Location[] RETURN_LOCS =
private static final Location[] RETURN_LOCS =
{
new Location(-80555, 150337, -3040),
new Location(-13953, 121404, -2984),

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java vendored
View File

@@ -31,7 +31,7 @@ import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
public final class StakatoNestTeleporter extends AbstractNpcAI
{
// Locations
private final static Location[] LOCS =
private static final Location[] LOCS =
{
new Location(80456, -52322, -5640),
new Location(88718, -46214, -4640),
@@ -40,7 +40,7 @@ public final class StakatoNestTeleporter extends AbstractNpcAI
new Location(87682, -43291, -4128)
};
// NPC
private final static int KINTAIJIN = 32640;
private static final int KINTAIJIN = 32640;
private StakatoNestTeleporter()
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java vendored
View File

@@ -29,7 +29,7 @@ import ai.AbstractNpcAI;
public final class StrongholdsTeleports extends AbstractNpcAI
{
// NPCs
private final static int[] NPCs =
private static final int[] NPCs =
{
32163,
32181,
@@ -48,9 +48,9 @@ public final class StrongholdsTeleports extends AbstractNpcAI
{
if (player.getLevel() < 20)
{
return String.valueOf(npc.getId()) + ".htm";
return npc.getId() + ".htm";
}
return String.valueOf(npc.getId()) + "-no.htm";
return npc.getId() + "-no.htm";
}
public static void main(String[] args)

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java vendored
View File

@@ -30,14 +30,14 @@ import ai.AbstractNpcAI;
public final class TeleportWithCharm extends AbstractNpcAI
{
// NPCs
private final static int WHIRPY = 30540;
private final static int TAMIL = 30576;
private static final int WHIRPY = 30540;
private static final int TAMIL = 30576;
// Items
private final static int ORC_GATEKEEPER_CHARM = 1658;
private final static int DWARF_GATEKEEPER_TOKEN = 1659;
private static final int ORC_GATEKEEPER_CHARM = 1658;
private static final int DWARF_GATEKEEPER_TOKEN = 1659;
// Locations
private final static Location ORC_TELEPORT = new Location(-80826, 149775, -3043);
private final static Location DWARF_TELEPORT = new Location(-80826, 149775, -3043);
private static final Location ORC_TELEPORT = new Location(-80826, 149775, -3043);
private static final Location DWARF_TELEPORT = new Location(-80826, 149775, -3043);
private TeleportWithCharm()
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java vendored
View File

@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.Util;
*/
public final class EchoCrystals extends Quest
{
private final static int[] NPCs =
private static final int[] NPCs =
{
31042,
31043

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java vendored
View File

@@ -59,7 +59,7 @@ public class NpcBuffer extends Quest
private static void print(Exception e)
{
_log.warning(">>>" + e.toString() + "<<<");
_log.warning(">>>" + e + "<<<");
if (DEBUG)
{
e.printStackTrace();
@@ -2023,7 +2023,7 @@ public class NpcBuffer extends Quest
return formatted;
}
static public void main(String[] args)
public static void main(String[] args)
{
new NpcBuffer();
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java vendored
View File

@@ -302,7 +302,7 @@ public final class NpcLocationInfo extends Quest
if (Util.contains(NPC, npcId))
{
htmltext = String.valueOf(npcId) + ".htm";
htmltext = npcId + ".htm";
}
return htmltext;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java vendored
View File

@@ -149,7 +149,7 @@ public final class SubClassSkills extends Quest
{
for (int j = Config.MAX_SUBCLASS; j > 0; j--)
{
qName = VARS[i] + String.valueOf(j);
qName = VARS[i] + j;
qValue = player.getVariables().getString(qName);
if ((qValue == null) || qValue.isEmpty())
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java vendored
View File

@@ -220,7 +220,7 @@ public final class Elpies extends Event
}
}
private static final void dropItem(L2Npc mob, L2PcInstance player, int[][] droplist)
private static void dropItem(L2Npc mob, L2PcInstance player, int[][] droplist)
{
final int chance = getRandom(100);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java vendored
View File

@@ -31,7 +31,7 @@ public final class CharacterBirthday extends Quest
private static final int ALEGRIA = 32600;
private static int SPAWNS = 0;
private final static int[] GK =
private static final int[] GK =
{
30006,
30059,

16
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java vendored
View File

@@ -27,20 +27,20 @@ import com.l2jmobius.gameserver.model.event.LongTimeEvent;
*/
public final class HeavyMedal extends LongTimeEvent
{
private final static int CAT_ROY = 31228;
private final static int CAT_WINNIE = 31229;
private final static int GLITTERING_MEDAL = 6393;
private static final int CAT_ROY = 31228;
private static final int CAT_WINNIE = 31229;
private static final int GLITTERING_MEDAL = 6393;
private final static int WIN_CHANCE = 50;
private static final int WIN_CHANCE = 50;
private final static int[] MEDALS =
private static final int[] MEDALS =
{
5,
10,
20,
40
};
private final static int[] BADGES =
private static final int[] BADGES =
{
6399,
6400,
@@ -93,12 +93,12 @@ public final class HeavyMedal extends LongTimeEvent
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
level++;
}
htmltext = "31229-" + event.toLowerCase() + "-" + String.valueOf(level) + ".htm";
htmltext = "31229-" + event.toLowerCase() + "-" + level + ".htm";
}
}
else if (event.equalsIgnoreCase("talk"))
{
htmltext = String.valueOf(npc.getId()) + "-lvl-" + String.valueOf(level) + ".htm";
htmltext = npc.getId() + "-lvl-" + level + ".htm";
}
return htmltext;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java vendored
View File

@@ -608,7 +608,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
return "";
}
private static final void finishInstance(InstanceWorld world)
private static void finishInstance(InstanceWorld world)
{
if (world instanceof HEAWorld)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java vendored
View File

@@ -981,7 +981,7 @@ public class SeedOfDestruction extends AbstractNpcAI
}
}
private static final void removeBuffs(L2Character ch)
private static void removeBuffs(L2Character ch)
{
ch.stopAllEffectsExceptThoseThatLastThroughDeath();
if (ch.hasSummon())

16
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@@ -70,7 +70,7 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%race%", ((L2Npc) target).getTemplate().getRace().toString());
html.replace("%id%", String.valueOf(((L2Npc) target).getTemplate().getId()));
html.replace("%lvl%", String.valueOf(((L2Npc) target).getTemplate().getLevel()));
html.replace("%name%", String.valueOf(((L2Npc) target).getTemplate().getName()));
html.replace("%name%", ((L2Npc) target).getTemplate().getName());
html.replace("%tmplid%", String.valueOf(((L2Npc) target).getTemplate().getId()));
html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0));
html.replace("%hp%", String.valueOf((int) ((L2Character) target).getCurrentHp()));
@@ -96,7 +96,7 @@ public class L2NpcActionShift implements IActionShiftHandler
html.replace("%int%", String.valueOf(((L2Character) target).getINT()));
html.replace("%wit%", String.valueOf(((L2Character) target).getWIT()));
html.replace("%men%", String.valueOf(((L2Character) target).getMEN()));
html.replace("%loc%", String.valueOf(target.getX() + " " + target.getY() + " " + target.getZ()));
html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ());
html.replace("%heading%", String.valueOf(((L2Character) target).getHeading()));
html.replace("%collision_radius%", String.valueOf(((L2Character) target).getTemplate().getfCollisionRadius()));
html.replace("%collision_height%", String.valueOf(((L2Character) target).getTemplate().getfCollisionHeight()));
@@ -134,11 +134,11 @@ public class L2NpcActionShift implements IActionShiftHandler
}
else if (((L2Npc) target).getSpawn().hasRespawnRandom())
{
html.replace("%resp%", String.valueOf(((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((((L2Npc) target).getSpawn().getRespawnMaxDelay() / 1000) + " sec"));
html.replace("%resp%", ((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000 + "-" + (((L2Npc) target).getSpawn().getRespawnMaxDelay() / 1000) + " sec");
}
else
{
html.replace("%resp%", String.valueOf(((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000) + " sec");
html.replace("%resp%", ((L2Npc) target).getSpawn().getRespawnMinDelay() / 1000 + " sec");
}
}
else
@@ -158,11 +158,11 @@ public class L2NpcActionShift implements IActionShiftHandler
final String clansString = clans != null ? Util.implode(clans.toArray(), ", ") : "";
final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? Util.implode(ignoreClanNpcIds.toArray(), ", ") : "";
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + String.valueOf(((L2Npc) target).getAI().getIntention().name()) + "</td></tr></table></td></tr>");
html.replace("%ai_intention%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Intention:</font></td><td align=right width=170>" + ((L2Npc) target).getAI().getIntention().name() + "</td></tr></table></td></tr>");
html.replace("%ai%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>AI</font></td><td align=right width=170>" + ((L2Npc) target).getAI().getClass().getSimpleName() + "</td></tr></table></td></tr>");
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + String.valueOf(((L2Npc) target).getAiType()) + "</td></tr></table></td></tr>");
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + String.valueOf(((L2Npc) target).getTemplate().getClanHelpRange()) + "</td></tr></table></td></tr>");
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + String.valueOf(((L2Npc) target).getTemplate().getAggroRange()) + "</td></tr></table></td></tr>");
html.replace("%ai_type%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>AIType</font></td><td align=right width=170>" + ((L2Npc) target).getAiType() + "</td></tr></table></td></tr>");
html.replace("%ai_clan%", "<tr><td><table width=270 border=0><tr><td width=100><font color=FFAA00>Clan & Range:</font></td><td align=right width=170>" + clansString + " " + ((L2Npc) target).getTemplate().getClanHelpRange() + "</td></tr></table></td></tr>");
html.replace("%ai_enemy_clan%", "<tr><td><table width=270 border=0 bgcolor=131210><tr><td width=100><font color=FFAA00>Ignore & Range:</font></td><td align=right width=170>" + ignoreClanNpcIdsString + " " + ((L2Npc) target).getTemplate().getAggroRange() + "</td></tr></table></td></tr>");
}
else
{

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.GMAudit;
public class AdminBuffs implements IAdminCommandHandler
{
private final static int PAGE_LIMIT = 20;
private static final int PAGE_LIMIT = 20;
private static final String[] ADMIN_COMMANDS =
{
@@ -338,7 +338,7 @@ public class AdminBuffs implements IAdminCommandHandler
String slots = "";
for (AbnormalType slot : target.getEffectList().getAllBlockedBuffSlots())
{
slots += slot.toString() + ", ";
slots += slot + ", ";
}
if (!slots.isEmpty() && (slots.length() > 3))
@@ -352,7 +352,7 @@ public class AdminBuffs implements IAdminCommandHandler
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "getbuffs", target.getName() + " (" + Integer.toString(target.getObjectId()) + ")", "");
GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "getbuffs", target.getName() + " (" + target.getObjectId() + ")", "");
}
}

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java vendored
View File

@@ -69,7 +69,8 @@ public final class AdminCHSiege implements IAdminCommandHandler
activeChar.sendMessage("You have to specify the hall id at least");
return false;
}
if ((hall = getHall(split[1], activeChar)) == null)
hall = getHall(split[1], activeChar);
if (hall == null)
{
activeChar.sendMessage("Couldnt find he desired siegable hall (" + split[1] + ")");
return false;
@@ -161,7 +162,7 @@ public final class AdminCHSiege implements IAdminCommandHandler
if (c.getTimeInMillis() > System.currentTimeMillis())
{
activeChar.sendMessage(hall.getName() + " siege: " + c.getTime().toString());
activeChar.sendMessage(hall.getName() + " siege: " + c.getTime());
hall.setNextSiegeDate(c.getTimeInMillis());
hall.getSiege().updateSiege();
hall.updateDb();

10
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -1040,8 +1040,8 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%account%", player.getAccountName());
adminReply.replace("%ip%", ip);
adminReply.replace("%hwid%", hwid);
adminReply.replace("%ai%", String.valueOf(player.getAI().getIntention().name()));
adminReply.replace("%inst%", player.getInstanceId() > 0 ? "<tr><td>InstanceId:</td><td><a action=\"bypass -h admin_instance_spawns " + String.valueOf(player.getInstanceId()) + "\">" + String.valueOf(player.getInstanceId()) + "</a></td></tr>" : "");
adminReply.replace("%ai%", player.getAI().getIntention().name());
adminReply.replace("%inst%", player.getInstanceId() > 0 ? "<tr><td>InstanceId:</td><td><a action=\"bypass -h admin_instance_spawns " + player.getInstanceId() + "\">" + player.getInstanceId() + "</a></td></tr>" : "");
adminReply.replace("%noblesse%", player.isNoble() ? "Yes" : "No");
activeChar.sendPacket(adminReply);
}
@@ -1251,7 +1251,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
else if (CharactersFound > 20)
{
adminReply.replace("%number%", " more than " + String.valueOf(CharactersFound));
adminReply.replace("%number%", " more than " + CharactersFound);
replyMSG2 = "s.<br>In order to avoid you a client crash I won't <br1>display results beyond the 20th character.";
}
else if (CharactersFound == 1)
@@ -1487,7 +1487,7 @@ public class AdminEditChar implements IAdminCommandHandler
final String owner = target.getActingPlayer().getName();
html.replace("%owner%", " <a action=\"bypass -h admin_character_info " + owner + "\">" + owner + "</a>");
html.replace("%class%", target.getClass().getSimpleName());
html.replace("%ai%", target.hasAI() ? String.valueOf(target.getAI().getIntention().name()) : "NULL");
html.replace("%ai%", target.hasAI() ? target.getAI().getIntention().name() : "NULL");
html.replace("%hp%", (int) target.getStatus().getCurrentHp() + "/" + target.getStat().getMaxHp());
html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp());
html.replace("%karma%", Integer.toString(target.getKarma()));
@@ -1531,7 +1531,7 @@ public class AdminEditChar implements IAdminCommandHandler
text.append("<tr><td><table width=270 border=0 cellpadding=2><tr><td width=30 align=right>");
}
text.append(member.getLevel() + "</td><td width=130><a action=\"bypass -h admin_character_info " + member.getName() + "\">" + member.getName() + "</a>");
text.append("</td><td width=110 align=right>" + member.getClassId().toString() + "</td></tr></table></td></tr>");
text.append("</td><td width=110 align=right>" + member.getClassId() + "</td></tr></table></td></tr>");
color = !color;
}
html.replace("%player%", target.getName());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@@ -477,7 +477,7 @@ public class AdminEventEngine implements IAdminCommandHandler
result.append("</table>");
return note + result.toString();
return note + result;
}
public void showMainPage(L2PcInstance activeChar)

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@@ -458,7 +458,7 @@ public final class AdminPForge implements IAdminCommandHandler
target = activeChar.getTarget();
if ((target != null) && (target instanceof L2Character))
{
value = String.valueOf(((L2Character) target).getTitle());
value = ((L2Character) target).getTitle();
}
else
{
@@ -469,7 +469,7 @@ public final class AdminPForge implements IAdminCommandHandler
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getName());
value = target.getName();
}
else
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java vendored
View File

@@ -385,7 +385,7 @@ public class AdminPunishment implements IAdminCommandHandler
return true;
}
private static final String findCharId(String key)
private static String findCharId(String key)
{
final int charId = CharNameTable.getInstance().getIdByName(key);
if (charId > 0) // Yeah its a char name!

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@@ -89,7 +89,7 @@ public class AdminShowQuests implements IAdminCommandHandler
{
val[0] = "full";
}
if (cmdParams[2].indexOf("_") != -1)
if (cmdParams[2].contains("_"))
{
val[0] = "name";
val[1] = cmdParams[2];

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java vendored
View File

@@ -112,7 +112,7 @@ public class AdminShutdown implements IAdminCommandHandler
adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm");
adminReply.replace("%count%", String.valueOf(L2World.getInstance().getAllPlayersCount()));
adminReply.replace("%used%", String.valueOf(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()));
adminReply.replace("%time%", String.valueOf(format.format(cal.getTime())));
adminReply.replace("%time%", format.format(cal.getTime()));
activeChar.sendPacket(adminReply);
}

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java vendored
View File

@@ -365,7 +365,7 @@ public class AdminSiege implements IAdminCommandHandler
{
if (hall != null)
{
cList.append("<td fixwidth=90><a action=\"bypass -h admin_chsiege_siegablehall " + String.valueOf(hall.getId()) + "\">" + hall.getName() + "</a></td>");
cList.append("<td fixwidth=90><a action=\"bypass -h admin_chsiege_siegablehall " + hall.getId() + "\">" + hall.getName() + "</a></td>");
i++;
}
if (i > 1)
@@ -381,7 +381,7 @@ public class AdminSiege implements IAdminCommandHandler
{
if (clanhall != null)
{
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + String.valueOf(clanhall.getId()) + "\">" + clanhall.getName() + "</a></td>");
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + clanhall.getId() + "\">" + clanhall.getName() + "</a></td>");
i++;
}
if (i > 1)
@@ -397,7 +397,7 @@ public class AdminSiege implements IAdminCommandHandler
{
if (clanhall != null)
{
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + String.valueOf(clanhall.getId()) + "\">" + clanhall.getName() + "</a></td>");
cList.append("<td fixwidth=134><a action=\"bypass -h admin_clanhall " + clanhall.getId() + "\">" + clanhall.getName() + "</a></td>");
i++;
}
if (i > 1)
@@ -453,18 +453,18 @@ public class AdminSiege implements IAdminCommandHandler
if (isSunday)
{
adminReply.replace("%sundaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
adminReply.replace("%sunday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
adminReply.replace("%sunday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
newDay.add(Calendar.DAY_OF_MONTH, 13);
adminReply.replace("%saturdaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
adminReply.replace("%saturday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
adminReply.replace("%saturday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
}
else
{
adminReply.replace("%saturdaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
adminReply.replace("%saturday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
adminReply.replace("%saturday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
newDay.add(Calendar.DAY_OF_MONTH, 1);
adminReply.replace("%sundaylink%", String.valueOf(newDay.get(Calendar.DAY_OF_YEAR)));
adminReply.replace("%sunday%", String.valueOf(newDay.get(Calendar.MONTH) + "/" + String.valueOf(newDay.get(Calendar.DAY_OF_MONTH))));
adminReply.replace("%sunday%", newDay.get(Calendar.MONTH) + "/" + newDay.get(Calendar.DAY_OF_MONTH));
}
activeChar.sendPacket(adminReply);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java vendored
View File

@@ -128,7 +128,7 @@ public class ClanWarehouse implements IBypassHandler
return false;
}
private static final void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
private static void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
{
player.sendPacket(ActionFailed.STATIC_PACKET);

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java vendored
View File

@@ -227,7 +227,7 @@ public class Festival implements IBypassHandler
if (dawnScore > 0)
{
strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + String.valueOf(dawnScore) + "<br>" + dawnData.getString("members") + "<br>");
strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + dawnScore + "<br>" + dawnData.getString("members") + "<br>");
}
else
{
@@ -236,7 +236,7 @@ public class Festival implements IBypassHandler
if (duskScore > 0)
{
strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + String.valueOf(duskScore) + "<br>" + duskData.getString("members") + "<br>");
strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + duskScore + "<br>" + duskData.getString("members") + "<br>");
}
else
{
@@ -255,14 +255,14 @@ public class Festival implements IBypassHandler
cabalStr = "Children of Dusk";
}
strBuffer.append("Consecutive top scores: " + calculateDate(overallData.getString("date")) + ". Score " + String.valueOf(overallScore) + "<br>Affilated side: " + cabalStr + "<br>" + overallData.getString("members") + "<br>");
strBuffer.append("Consecutive top scores: " + calculateDate(overallData.getString("date")) + ". Score " + overallScore + "<br>Affilated side: " + cabalStr + "<br>" + overallData.getString("members") + "<br>");
}
else
{
strBuffer.append("Consecutive top scores: No record exists. Score 0<br>");
}
strBuffer.append("<a action=\"bypass -h npc_" + String.valueOf(npc.getObjectId()) + "_Chat 0\">Go back.</a></body></html>");
strBuffer.append("<a action=\"bypass -h npc_" + npc.getObjectId() + "_Chat 0\">Go back.</a></body></html>");
final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
html.setHtml(strBuffer.toString());

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java vendored
View File

@@ -90,7 +90,7 @@ public class Loto implements IBypassHandler
// 23 - current lottery jackpot
// 24 - Previous winning numbers/Prize claim
// >24 - check lottery ticket by item object id
public static final void showLotoWindow(L2PcInstance player, L2Npc npc, int val)
public static void showLotoWindow(L2PcInstance player, L2Npc npc, int val)
{
final int npcId = npc.getTemplate().getId();
String filename;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java vendored
View File

@@ -155,7 +155,7 @@ public class Observation implements IBypassHandler
return false;
}
private static final void doObserve(L2PcInstance player, L2Npc npc, Location pos, long cost)
private static void doObserve(L2PcInstance player, L2Npc npc, Location pos, long cost)
{
if (player.reduceAdena("Broadcast", cost, npc, true))
{

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java vendored
View File

@@ -57,8 +57,8 @@ public class OlympiadManagerLink implements IBypassHandler
"olympiad"
};
private static final String FEWER_THAN = "Fewer than " + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
private static final String MORE_THAN = "More than " + String.valueOf(Config.ALT_OLY_REG_DISPLAY);
private static final String FEWER_THAN = "Fewer than " + Config.ALT_OLY_REG_DISPLAY;
private static final String MORE_THAN = "More than " + Config.ALT_OLY_REG_DISPLAY;
private static final int GATE_PASS = Config.ALT_OLY_COMP_RITEM;
private static final int[] BUFFS =

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java vendored
View File

@@ -42,7 +42,7 @@ public class PlayerHelp implements IBypassHandler
}
final String path = command.substring(12);
if (path.indexOf("..") != -1)
if (path.contains(".."))
{
return false;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java vendored
View File

@@ -106,7 +106,7 @@ public class PrivateWarehouse implements IBypassHandler
return false;
}
private static final void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
private static void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
player.setActiveWarehouse(player.getWarehouse());

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -122,7 +122,7 @@ public class QuestLink implements IBypassHandler
state = quest.isCustomQuest() ? " (Done)" : "03";
// color = "787878";
}
sb.append("<a action=\"bypass -h npc_" + String.valueOf(npc.getObjectId()) + "_Quest " + quest.getName() + "\">");
sb.append("<a action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
// StringUtil.append(sb, "<font color=\"" + color + "\">[");
sb.append("[");
@@ -132,7 +132,7 @@ public class QuestLink implements IBypassHandler
}
else
{
sb.append("<fstring>" + String.valueOf(quest.getNpcStringId()) + state + "</fstring>");
sb.append("<fstring>" + quest.getNpcStringId() + state + "</fstring>");
}
// sb.append("]</font></a><br>");
sb.append("]</a><br>");

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java vendored
View File

@@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler
return false;
}
public static final void tryRentPet(L2PcInstance player, int val)
public static void tryRentPet(L2PcInstance player, int val)
{
if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java vendored
View File

@@ -68,7 +68,7 @@ public class Wear implements IBypassHandler
return false;
}
private static final void showWearWindow(L2PcInstance player, int val)
private static void showWearWindow(L2PcInstance player, int val)
{
final L2BuyList buyList = BuyListData.getInstance().getBuyList(val);
if (buyList == null)

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java vendored
View File

@@ -69,7 +69,7 @@ public class FavoriteBoard implements IParseBoardHandler
{
while (rs.next())
{
String link = list.replaceAll("%fav_bypass%", String.valueOf(rs.getString("favBypass")));
String link = list.replaceAll("%fav_bypass%", rs.getString("favBypass"));
link = link.replaceAll("%fav_title%", rs.getString("favTitle"));
final SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
link = link.replaceAll("%fav_add_date%", date.format(rs.getTimestamp("favAddDate")));

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java vendored
View File

@@ -67,7 +67,7 @@ public class RegionBoard implements IWriteBoardHandler
link = link.replace("%region_name%", String.valueOf(REGIONS[i]));
link = link.replace("%region_owning_clan%", (clan != null ? clan.getName() : "NPC"));
link = link.replace("%region_owning_clan_alliance%", ((clan != null) && (clan.getAllyName() != null) ? clan.getAllyName() : ""));
link = link.replace("%region_tax_rate%", String.valueOf(castle.getTaxRate() * 100) + "%");
link = link.replace("%region_tax_rate%", castle.getTaxRate() * 100 + "%");
sb.append(link);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java vendored
View File

@@ -164,7 +164,7 @@ public class DebugHandler implements ITelnetHandler
final StackTraceElement[] stes = entry.getValue();
final Thread t = entry.getKey();
sb.append("--------------\n");
sb.append(t.toString() + " (" + t.getId() + ")\n");
sb.append(t + " (" + t.getId() + ")\n");
sb.append("State: " + t.getState() + '\n');
sb.append("isAlive: " + t.isAlive() + " | isDaemon: " + t.isDaemon() + " | isInterrupted: " + t.isInterrupted() + '\n');
sb.append('\n');

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java vendored
View File

@@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler
html.append("<tr><td>Drop Amount: <font color=\"LEVEL\">x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " <br1></font></td></tr>");
html.append("<tr><td>Spoil Chance: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " <br1></font></td></tr>");
html.append("<tr><td>Spoil Amount: <font color=\"LEVEL\">x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " <br1></font></td></tr>");
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + String.valueOf(format.format(endDate)) + "</font></td></tr>");
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + String.valueOf(format.format(System.currentTimeMillis())) + "<br><br></font></td></tr>");
html.append("<tr><td>Expires: <font color=\"00A5FF\">" + format.format(endDate) + "</font></td></tr>");
html.append("<tr><td>Current Date: <font color=\"70FFCA\">" + format.format(System.currentTimeMillis()) + "<br><br></font></td></tr>");
html.append("<tr><td><center>Premium Info & Rules<br></center></td></tr>");
html.append("<tr><td><font color=\"70FFCA\">1. Premium accounts CAN NOT BE TRANSFERED.<br1></font></td></tr>");
html.append("<tr><td><font color=\"70FFCA\">2. Premium does not effect party members.<br1></font></td></tr>");

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java vendored
View File

@@ -104,7 +104,7 @@ public final class Bernarde extends AbstractNpcAI
}
}
private static final boolean isTransformed(L2PcInstance player)
private static boolean isTransformed(L2PcInstance player)
{
return player.isTransformed() && (player.getTransformation().getId() == NATIVE_TRANSFORM);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@@ -375,7 +375,7 @@ public abstract class Chamber extends AbstractInstance
}
// Save location for teleport back into main hall
partyMember.getVariables().set(RETURN, Integer.toString(partyMember.getX()) + ";" + Integer.toString(partyMember.getY()) + ";" + Integer.toString(partyMember.getZ()));
partyMember.getVariables().set(RETURN, partyMember.getX() + ";" + partyMember.getY() + ";" + partyMember.getZ());
partyMember.setInstanceId(world.getInstanceId());
world.addAllowed(partyMember.getObjectId());

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java vendored
View File

@@ -135,7 +135,7 @@ public final class CrystalCaverns extends AbstractInstance
private static final int CONT_CRYSTAL = 9690; // Contaminated Crystal
private static final int RED_CORAL = 9692; // Red Coral
private static final int CRYSTALFOOD = 9693; // Food item for Crystal Golems
final private static int RACE_KEY = 9694; // Race Key for Emerald doors
private static final int RACE_KEY = 9694; // Race Key for Emerald doors
private static final int BOSS_CRYSTAL_1 = 9695; // Clear Crystal
private static final int BOSS_CRYSTAL_2 = 9696; // Clear Crystal
private static final int BOSS_CRYSTAL_3 = 9697; // Clear Crystal
@@ -167,7 +167,7 @@ public final class CrystalCaverns extends AbstractInstance
private static final int KECHIGUARD = 25533;
private static final int BAYLOR = 29099;
private static final int DARNEL = 25531;
private final static int ALARMID = 18474;
private static final int ALARMID = 18474;
// private static final int[] BOSSCR = {9695,9696,9697};
private static final int[] CGMOBS =
{
@@ -232,7 +232,7 @@ public final class CrystalCaverns extends AbstractInstance
20107
};
// @formatter:off
private final static int[][] ALARMSPAWN =
private static final int[][] ALARMSPAWN =
{
{153572, 141277, -12738},
{153572, 142852, -12738},
@@ -1740,7 +1740,7 @@ public final class CrystalCaverns extends AbstractInstance
npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
final Instance baylorInstance = InstanceManager.getInstance().getInstance(npc.getInstanceId());
baylorInstance.setDuration(300000);
this.startQuestTimer("spawn_oracle", 1000, npc, null);
startQuestTimer("spawn_oracle", 1000, npc, null);
giveRewards(player, npc.getInstanceId(), -1, true);
}
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -1225,7 +1225,7 @@ public final class Kamaloka extends AbstractInstance
* @param index (0-18) index of the kamaloka in arrays
* @return true if party allowed to enter
*/
private static final boolean checkPartyConditions(L2PcInstance player, int index)
private static boolean checkPartyConditions(L2PcInstance player, int index)
{
final L2Party party = player.getParty();
// player must be in party
@@ -1302,7 +1302,7 @@ public final class Kamaloka extends AbstractInstance
* Removing all buffs from player and pet except BUFFS_WHITELIST
* @param ch player
*/
private static final void removeBuffs(L2Character ch)
private static void removeBuffs(L2Character ch)
{
final Function<BuffInfo, Boolean> removeBuffs = info ->
{

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
View File

@@ -166,7 +166,7 @@ public final class NornilsGarden extends AbstractInstance
};
// @formatter:on
private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
private static void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
{
final int chance = getRandom(100);
for (int[] element : drop)
@@ -178,7 +178,7 @@ public final class NornilsGarden extends AbstractInstance
}
}
private static final void giveBuffs(L2Character ch)
private static void giveBuffs(L2Character ch)
{
if (skill1 != null)
{
@@ -395,7 +395,7 @@ public final class NornilsGarden extends AbstractInstance
}
}
private static final String checkConditions(L2Npc npc, L2PcInstance player)
private static String checkConditions(L2Npc npc, L2PcInstance player)
{
final L2Party party = player.getParty();
// player must be in party
@@ -537,7 +537,7 @@ public final class NornilsGarden extends AbstractInstance
int correct = st.getInt("correct");
correct++;
st.set("correct", String.valueOf(correct));
htmltext = npc.getId() + "-0" + String.valueOf(correct + 2) + ".html";
htmltext = npc.getId() + "-0" + correct + 2 + ".html";
}
else if (event.equalsIgnoreCase("check"))
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java vendored
View File

@@ -46,7 +46,7 @@ public final class SanctumOftheLordsOfDawn extends AbstractInstance
protected static final class HSWorld extends InstanceWorld
{
protected int doorst = 0;
protected final static Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
protected static final Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
public static Map<Integer, List<L2Npc>> getMonsters()
{

32
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java vendored
View File

@@ -33,24 +33,24 @@ import com.l2jmobius.gameserver.util.Util;
public final class Q00171_ActsOfEvil extends Quest
{
// NPCs
private final static int TRADER_ARODIN = 30207;
private static final int TRADER_ARODIN = 30207;
private static final int GUARD_ALVAH = 30381;
private final static int TYRA = 30420;
private final static int NETI = 30425;
private final static int TRADER_ROLENTO = 30437;
private final static int TUREK_CHIEF_BURAI = 30617;
private static final int TYRA = 30420;
private static final int NETI = 30425;
private static final int TRADER_ROLENTO = 30437;
private static final int TUREK_CHIEF_BURAI = 30617;
// Items
private final static int BLADE_MOLD = 4239;
private final static int TYRAS_BILL = 4240;
private final static int RANGERS_REPORT1 = 4241;
private final static int RANGERS_REPORT2 = 4242;
private final static int RANGERS_REPORT3 = 4243;
private final static int RANGERS_REPORT4 = 4244;
private final static int WEAPONS_TRADE_CONTRACT = 4245;
private final static int ATTACK_DIRECTIVES = 4246;
private final static int CERTIFICATE_OF_THE_SILVER_GUILD = 4247;
private final static int ROLENTOS_CARGOBOX = 4248;
private final static int OL_MAHUM_CAPTAINS_HEAD = 4249;
private static final int BLADE_MOLD = 4239;
private static final int TYRAS_BILL = 4240;
private static final int RANGERS_REPORT1 = 4241;
private static final int RANGERS_REPORT2 = 4242;
private static final int RANGERS_REPORT3 = 4243;
private static final int RANGERS_REPORT4 = 4244;
private static final int WEAPONS_TRADE_CONTRACT = 4245;
private static final int ATTACK_DIRECTIVES = 4246;
private static final int CERTIFICATE_OF_THE_SILVER_GUILD = 4247;
private static final int ROLENTOS_CARGOBOX = 4248;
private static final int OL_MAHUM_CAPTAINS_HEAD = 4249;
// Monster
private static final int TUMRAN_BUGBEAR = 20062;
private static final int TUMRAN_BUGBEAR_WARRIOR = 20064;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java vendored
View File

@@ -294,7 +294,7 @@ public final class Q00175_TheWayOfTheWarrior extends Quest
return htmltext;
}
public static final void giveNewbieReward(L2PcInstance player)
public static void giveNewbieReward(L2PcInstance player)
{
final PlayerVariables vars = player.getVariables();
if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java vendored
View File

@@ -37,7 +37,7 @@ import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
*/
public final class Q00257_TheGuardIsBusy extends Quest
{
public final static class MobDrop extends ItemHolder
public static final class MobDrop extends ItemHolder
{
private final int _chance;
private final int _random;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java vendored
View File

@@ -138,7 +138,7 @@ public final class Q00279_TargetOfOpportunity extends Quest
return htmltext;
}
private static final boolean haveAllExceptThis(L2PcInstance player, int idx)
private static boolean haveAllExceptThis(L2PcInstance player, int idx)
{
for (int i = 0; i < SEAL_COMPONENTS.length; i++)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java vendored
View File

@@ -195,7 +195,7 @@ public final class Q00281_HeadForTheHills extends Quest
* Give basic newbie reward.
* @param player the player to reward
*/
public static final void giveNewbieReward(L2PcInstance player)
public static void giveNewbieReward(L2PcInstance player)
{
final PlayerVariables vars = player.getVariables();
if ((player.getLevel() < 25) && !vars.getBoolean("NEWBIE_SHOTS", false))

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java vendored
View File

@@ -157,7 +157,7 @@ public final class Q00306_CrystalOfFireAndIce extends Quest
return htmltext;
}
private static final void giveKillReward(L2PcInstance player, L2Npc npc)
private static void giveKillReward(L2PcInstance player, L2Npc npc)
{
if (Util.checkIfInRange(1500, npc, player, false))
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java vendored
View File

@@ -349,7 +349,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest
return htmltext;
}
private static final void tradeItems(L2PcInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
private static void tradeItems(L2PcInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
{
if (itemCount1 < required)
{

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java vendored
View File

@@ -248,7 +248,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
return htmltext;
}
private static final boolean giveReward(L2PcInstance player, int itemId, int minCount, int rewardItemId, long rewardCount)
private static boolean giveReward(L2PcInstance player, int itemId, int minCount, int rewardItemId, long rewardCount)
{
long count = getQuestItemsCount(player, itemId);
if (count < minCount)

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java vendored
View File

@@ -272,7 +272,7 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest
return htmltext;
}
private static final void finishInstance(L2PcInstance player)
private static void finishInstance(L2PcInstance player)
{
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java vendored
View File

@@ -248,7 +248,7 @@ public final class Q00695_DefendTheHallOfSuffering extends Quest
return htmltext;
}
private static final void finishInstance(L2PcInstance player)
private static void finishInstance(L2PcInstance player)
{
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java vendored
View File

@@ -137,7 +137,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
if (Util.isDigit(event))
{
htmltext = Integer.toString(npc.getId()) + "-1" + event + ".html";
htmltext = npc.getId() + "-1" + event + ".html";
giveItems(player, 10520 + Integer.valueOf(event), 2);
addExpAndSp(player, 202160, 20375);
qs.exitQuest(false, true);