diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java index e2cc7b5b80..3e1ac09aea 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java @@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%race%", npc.getTemplate().getRace().toString()); html.replace("%id%", String.valueOf(npc.getTemplate().getId())); html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel())); - html.replace("%name%", String.valueOf(npc.getTemplate().getName())); + html.replace("%name%", npc.getTemplate().getName()); html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId())); html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0)); html.replace("%hp%", String.valueOf((int) npc.getCurrentHp())); @@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%int%", String.valueOf(npc.getINT())); html.replace("%wit%", String.valueOf(npc.getWIT())); html.replace("%men%", String.valueOf(npc.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(npc.getHeading())); html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); @@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler { final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); html.replace("%spawnfile%", fileName); - html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName())); - html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); + html.replace("%spawnname%", template.getSpawnTemplate().getName()); + html.replace("%spawngroup%", template.getGroup().getName()); if (template.getSpawnTemplate().getAI() != null) { final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); @@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler } else if (npc.getSpawn().hasRespawnRandom()) { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec")); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); } else { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec"); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); } } else @@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : ""; final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : ""; - html.replace("%ai_intention%", "
Intention:" + String.valueOf(npc.getAI().getIntention().name()) + "
"); + html.replace("%ai_intention%", "
Intention:" + npc.getAI().getIntention().name() + "
"); html.replace("%ai%", "
AI" + npc.getAI().getClass().getSimpleName() + "
"); - html.replace("%ai_type%", "
AIType" + String.valueOf(npc.getAiType()) + "
"); - html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "
"); - html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "
"); + html.replace("%ai_type%", "
AIType" + npc.getAiType() + "
"); + html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + npc.getTemplate().getClanHelpRange() + "
"); + html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "
"); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java index 883150945a..c63cafe753 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java @@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm"); adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size())); 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); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 7b1bcbfc56..6f2671122b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler html.append("Drop Amount: x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " "); html.append("Spoil Chance: x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " "); html.append("Spoil Amount: x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " "); - html.append("Expires: " + String.valueOf(format.format(endDate)) + ""); - html.append("Current Date: " + String.valueOf(format.format(System.currentTimeMillis())) + "

"); + html.append("Expires: " + format.format(endDate) + ""); + html.append("Current Date: " + format.format(System.currentTimeMillis()) + "

"); html.append("
Premium Info & Rules
"); html.append("1. Premium accounts CAN NOT BE TRANSFERED."); html.append("2. Premium does not effect party members."); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java index e2cc7b5b80..3e1ac09aea 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java @@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%race%", npc.getTemplate().getRace().toString()); html.replace("%id%", String.valueOf(npc.getTemplate().getId())); html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel())); - html.replace("%name%", String.valueOf(npc.getTemplate().getName())); + html.replace("%name%", npc.getTemplate().getName()); html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId())); html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0)); html.replace("%hp%", String.valueOf((int) npc.getCurrentHp())); @@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%int%", String.valueOf(npc.getINT())); html.replace("%wit%", String.valueOf(npc.getWIT())); html.replace("%men%", String.valueOf(npc.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(npc.getHeading())); html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); @@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler { final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); html.replace("%spawnfile%", fileName); - html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName())); - html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); + html.replace("%spawnname%", template.getSpawnTemplate().getName()); + html.replace("%spawngroup%", template.getGroup().getName()); if (template.getSpawnTemplate().getAI() != null) { final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); @@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler } else if (npc.getSpawn().hasRespawnRandom()) { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec")); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); } else { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec"); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); } } else @@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : ""; final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : ""; - html.replace("%ai_intention%", "
Intention:" + String.valueOf(npc.getAI().getIntention().name()) + "
"); + html.replace("%ai_intention%", "
Intention:" + npc.getAI().getIntention().name() + "
"); html.replace("%ai%", "
AI" + npc.getAI().getClass().getSimpleName() + "
"); - html.replace("%ai_type%", "
AIType" + String.valueOf(npc.getAiType()) + "
"); - html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "
"); - html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "
"); + html.replace("%ai_type%", "
AIType" + npc.getAiType() + "
"); + html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + npc.getTemplate().getClanHelpRange() + "
"); + html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "
"); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java index 883150945a..c63cafe753 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java @@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm"); adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size())); 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); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 7b1bcbfc56..6f2671122b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler html.append("Drop Amount: x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " "); html.append("Spoil Chance: x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " "); html.append("Spoil Amount: x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " "); - html.append("Expires: " + String.valueOf(format.format(endDate)) + ""); - html.append("Current Date: " + String.valueOf(format.format(System.currentTimeMillis())) + "

"); + html.append("Expires: " + format.format(endDate) + ""); + html.append("Current Date: " + format.format(System.currentTimeMillis()) + "

"); html.append("
Premium Info & Rules
"); html.append("1. Premium accounts CAN NOT BE TRANSFERED."); html.append("2. Premium does not effect party members."); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java index e2cc7b5b80..3e1ac09aea 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java @@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%race%", npc.getTemplate().getRace().toString()); html.replace("%id%", String.valueOf(npc.getTemplate().getId())); html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel())); - html.replace("%name%", String.valueOf(npc.getTemplate().getName())); + html.replace("%name%", npc.getTemplate().getName()); html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId())); html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0)); html.replace("%hp%", String.valueOf((int) npc.getCurrentHp())); @@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%int%", String.valueOf(npc.getINT())); html.replace("%wit%", String.valueOf(npc.getWIT())); html.replace("%men%", String.valueOf(npc.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(npc.getHeading())); html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); @@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler { final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); html.replace("%spawnfile%", fileName); - html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName())); - html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); + html.replace("%spawnname%", template.getSpawnTemplate().getName()); + html.replace("%spawngroup%", template.getGroup().getName()); if (template.getSpawnTemplate().getAI() != null) { final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); @@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler } else if (npc.getSpawn().hasRespawnRandom()) { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec")); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); } else { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec"); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); } } else @@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : ""; final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : ""; - html.replace("%ai_intention%", "
Intention:" + String.valueOf(npc.getAI().getIntention().name()) + "
"); + html.replace("%ai_intention%", "
Intention:" + npc.getAI().getIntention().name() + "
"); html.replace("%ai%", "
AI" + npc.getAI().getClass().getSimpleName() + "
"); - html.replace("%ai_type%", "
AIType" + String.valueOf(npc.getAiType()) + "
"); - html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "
"); - html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "
"); + html.replace("%ai_type%", "
AIType" + npc.getAiType() + "
"); + html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + npc.getTemplate().getClanHelpRange() + "
"); + html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "
"); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java index 883150945a..c63cafe753 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java @@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm"); adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size())); 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); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 7b1bcbfc56..6f2671122b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler html.append("Drop Amount: x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " "); html.append("Spoil Chance: x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " "); html.append("Spoil Amount: x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " "); - html.append("Expires: " + String.valueOf(format.format(endDate)) + ""); - html.append("Current Date: " + String.valueOf(format.format(System.currentTimeMillis())) + "

"); + html.append("Expires: " + format.format(endDate) + ""); + html.append("Current Date: " + format.format(System.currentTimeMillis()) + "

"); html.append("
Premium Info & Rules
"); html.append("1. Premium accounts CAN NOT BE TRANSFERED."); html.append("2. Premium does not effect party members."); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java index 340c90bac4..ae4c9d651d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/FeedableBeasts.java @@ -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 diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java index 0bc83fcdb0..ea9afe0e43 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/group_template/LairOfAntharas.java @@ -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() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java index bf87874da2..7633df8889 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/individual/Orfen.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java index 815ff43f83..9acebb1874 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java @@ -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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java index f725123396..daa14d24e5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java index f0affc1b04..260170e21b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java @@ -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) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java index 32f3e725b8..fc64d693cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java @@ -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, diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java index fcb6d2bdb0..3e2967bb1d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java @@ -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 = { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java index fd5495ea5c..ce0f7fe919 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/OracleTeleport/OracleTeleport.java @@ -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), diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java index e72182bc10..1a01068d92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java @@ -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() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java index a11b6277c0..89cc361ae7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java @@ -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) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java index e50fb4acd9..e0d053941d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java @@ -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() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java index a7f8474a18..1b510669ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java @@ -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 diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java index 19b5a2a064..65dcd18fcf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcBuffer/NpcBuffer.java @@ -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(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java index 3eeaa3aac7..752b129676 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java index d28e6ad81c..78131cddfe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java index b542658795..953a7f89a9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 2e0e10d685..07ce2fd248 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -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, diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java index 49699a2b82..e8216dfa9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java @@ -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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index a386b1ca5f..64d20b2519 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -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) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java index c285d596dc..8ea45f9d15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/gracia/instances/SeedOfDestruction/SeedOfDestruction.java @@ -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()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java index 8a0690cf05..9908fc35ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java @@ -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%", "
Intention:" + String.valueOf(((L2Npc) target).getAI().getIntention().name()) + "
"); + html.replace("%ai_intention%", "
Intention:" + ((L2Npc) target).getAI().getIntention().name() + "
"); html.replace("%ai%", "
AI" + ((L2Npc) target).getAI().getClass().getSimpleName() + "
"); - html.replace("%ai_type%", "
AIType" + String.valueOf(((L2Npc) target).getAiType()) + "
"); - html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + String.valueOf(((L2Npc) target).getTemplate().getClanHelpRange()) + "
"); - html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + String.valueOf(((L2Npc) target).getTemplate().getAggroRange()) + "
"); + html.replace("%ai_type%", "
AIType" + ((L2Npc) target).getAiType() + "
"); + html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + ((L2Npc) target).getTemplate().getClanHelpRange() + "
"); + html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + ((L2Npc) target).getTemplate().getAggroRange() + "
"); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index 26193b06d2..5f5f167e55 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -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() + ")", ""); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java index c253ccfb9d..4376640637 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java @@ -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(); 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 ce69e7222a..e5f4aa140a 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 @@ -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 ? "InstanceId:" + String.valueOf(player.getInstanceId()) + "" : ""); + adminReply.replace("%ai%", player.getAI().getIntention().name()); + adminReply.replace("%inst%", player.getInstanceId() > 0 ? "InstanceId:" + player.getInstanceId() + "" : ""); 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.
In order to avoid you a client crash I won't 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%", " " + owner + ""); 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("
"); } text.append(member.getLevel() + "" + member.getName() + ""); - text.append("" + member.getClassId().toString() + "
"); + text.append("" + member.getClassId() + ""); color = !color; } html.replace("%player%", target.getName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 8e2a4d2490..0e79085b16 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -477,7 +477,7 @@ public class AdminEventEngine implements IAdminCommandHandler result.append(""); - return note + result.toString(); + return note + result; } public void showMainPage(L2PcInstance activeChar) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java index a87860d85a..8d9e9cea1b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java @@ -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 { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java index c5b33363d8..295d5fbf86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java @@ -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! diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java index e1619ac625..187079317b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java @@ -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]; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java index 5e51818365..54b7d7915f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java index 5f2805f168..aa9cf50e09 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java @@ -365,7 +365,7 @@ public class AdminSiege implements IAdminCommandHandler { if (hall != null) { - cList.append("" + hall.getName() + ""); + cList.append("" + hall.getName() + ""); i++; } if (i > 1) @@ -381,7 +381,7 @@ public class AdminSiege implements IAdminCommandHandler { if (clanhall != null) { - cList.append("" + clanhall.getName() + ""); + cList.append("" + clanhall.getName() + ""); i++; } if (i > 1) @@ -397,7 +397,7 @@ public class AdminSiege implements IAdminCommandHandler { if (clanhall != null) { - cList.append("" + clanhall.getName() + ""); + cList.append("" + clanhall.getName() + ""); 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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index c769fe36d9..e93d16cd8b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index 16cf44e49c..65469b2aea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -227,7 +227,7 @@ public class Festival implements IBypassHandler if (dawnScore > 0) { - strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + String.valueOf(dawnScore) + "
" + dawnData.getString("members") + "
"); + strBuffer.append("Dawn: " + calculateDate(dawnData.getString("date")) + ". Score " + dawnScore + "
" + dawnData.getString("members") + "
"); } else { @@ -236,7 +236,7 @@ public class Festival implements IBypassHandler if (duskScore > 0) { - strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + String.valueOf(duskScore) + "
" + duskData.getString("members") + "
"); + strBuffer.append("Dusk: " + calculateDate(duskData.getString("date")) + ". Score " + duskScore + "
" + duskData.getString("members") + "
"); } 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) + "
Affilated side: " + cabalStr + "
" + overallData.getString("members") + "
"); + strBuffer.append("Consecutive top scores: " + calculateDate(overallData.getString("date")) + ". Score " + overallScore + "
Affilated side: " + cabalStr + "
" + overallData.getString("members") + "
"); } else { strBuffer.append("Consecutive top scores: No record exists. Score 0
"); } - strBuffer.append("Go back."); + strBuffer.append("Go back."); final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); html.setHtml(strBuffer.toString()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index 2e3a901b47..3cb17591d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 86496586cd..8a33906a9e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -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)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java index 2caee55d0f..513a93e657 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java @@ -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 = diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java index c045e54c89..d8c05ac240 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PlayerHelp.java @@ -42,7 +42,7 @@ public class PlayerHelp implements IBypassHandler } final String path = command.substring(12); - if (path.indexOf("..") != -1) + if (path.contains("..")) { return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index e47a344c1b..a1713efa1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -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()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index e8dd28690a..d3ed051071 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -122,7 +122,7 @@ public class QuestLink implements IBypassHandler state = quest.isCustomQuest() ? " (Done)" : "03"; // color = "787878"; } - sb.append(""); + sb.append(""); // StringUtil.append(sb, "["); sb.append("["); @@ -132,7 +132,7 @@ public class QuestLink implements IBypassHandler } else { - sb.append("" + String.valueOf(quest.getNpcStringId()) + state + ""); + sb.append("" + quest.getNpcStringId() + state + ""); } // sb.append("]
"); sb.append("]
"); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java index 53c096e543..1f392e63bc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 47480db9ea..b932039875 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -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) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java index 90be7e7ef3..cfc7141d7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/FavoriteBoard.java @@ -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"))); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index dd55f7732f..f2e392daa5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java index 00022d549c..723313fe73 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java @@ -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'); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 7b1bcbfc56..6f2671122b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler html.append("Drop Amount: x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " "); html.append("Spoil Chance: x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " "); html.append("Spoil Amount: x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " "); - html.append("Expires: " + String.valueOf(format.format(endDate)) + ""); - html.append("Current Date: " + String.valueOf(format.format(System.currentTimeMillis())) + "

"); + html.append("Expires: " + format.format(endDate) + ""); + html.append("Current Date: " + format.format(System.currentTimeMillis()) + "

"); html.append("
Premium Info & Rules
"); html.append("1. Premium accounts CAN NOT BE TRANSFERED."); html.append("2. Premium does not effect party members."); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java index 28c9cbb8da..c75d864e1a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java @@ -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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index 9a30904360..c998194ab6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -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()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index b9d652a02e..88ad8243da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -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); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index f669b30b20..2cec290722 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -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 removeBuffs = info -> { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index 957d8855f9..f513d487bc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -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")) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java index 94e9d8f14f..6ba05dd119 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java @@ -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> _save_point = new HashMap<>(); + protected static final Map> _save_point = new HashMap<>(); public static Map> getMonsters() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java index b951a21521..f3a899c6cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java index 7e23303e49..02ddbadef6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java @@ -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)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java index aa5dc068a3..3091df1a18 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java index cd0900ac7e..ffbedc8791 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java @@ -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++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java index dfca8a2834..cad0ef9f01 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java @@ -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)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index d78caff8e8..5a3ef8f12b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -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)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java index c3adffbeb4..05f632f45f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java @@ -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) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java index 2499b92d7f..c9e3891f5e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java @@ -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) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java index ca8c7a3fce..49a66e21a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java index 2d57d86a54..40909cb978 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java index 84d1a9f61b..ade226ed91 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java @@ -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); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java index d73a559d90..eb1127c8f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java @@ -425,7 +425,7 @@ public class SevenSigns return reward; } - public static final String getCabalShortName(int cabal) + public static String getCabalShortName(int cabal) { switch (cabal) { @@ -438,7 +438,7 @@ public class SevenSigns return "No Cabal"; } - public static final String getCabalName(int cabal) + public static String getCabalName(int cabal) { switch (cabal) { @@ -451,7 +451,7 @@ public class SevenSigns return "No Cabal"; } - public static final String getSealName(int seal, boolean shortName) + public static String getSealName(int seal, boolean shortName) { String sealName = (!shortName) ? "Seal of " : ""; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index 9cea5616b8..2d80f47fbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -809,7 +809,7 @@ public class SevenSignsFestival implements SpawnListener * @param festivalID * @return String festivalName */ - public static final String getFestivalName(int festivalID) + public static String getFestivalName(int festivalID) { String festivalName; @@ -840,7 +840,7 @@ public class SevenSignsFestival implements SpawnListener * @param festivalId * @return int maxLevel */ - public static final int getMaxLevelForFestival(int festivalId) + public static int getMaxLevelForFestival(int festivalId) { int maxLevel = (ExperienceData.getInstance().getMaxLevel() - 1); @@ -868,7 +868,7 @@ public class SevenSignsFestival implements SpawnListener * @param npcId * @return boolean isArcher */ - protected static final boolean isFestivalArcher(int npcId) + protected static boolean isFestivalArcher(int npcId) { if ((npcId < 18009) || (npcId > 18108)) { @@ -884,7 +884,7 @@ public class SevenSignsFestival implements SpawnListener * @param npcId * @return boolean isChest */ - protected static final boolean isFestivalChest(int npcId) + protected static boolean isFestivalChest(int npcId) { return ((npcId < 18109) || (npcId > 18118)); } @@ -980,7 +980,7 @@ public class SevenSignsFestival implements SpawnListener for (int i = 0; i < FESTIVAL_COUNT; i++) { - _accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + String.valueOf(i))); + _accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + i)); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index ac8bcd6ad1..d7802d1fb0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -153,7 +153,7 @@ public class EnchantItemData implements IXmlReader * Gets the single instance of EnchantItemData. * @return single instance of EnchantItemData */ - public static final EnchantItemData getInstance() + public static EnchantItemData getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java index e90a049fa7..97eb133be0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java @@ -142,7 +142,7 @@ public class EnchantItemHPBonusData implements IXmlReader * Gets the single instance of EnchantHPBonusData. * @return single instance of EnchantHPBonusData */ - public static final EnchantItemHPBonusData getInstance() + public static EnchantItemHPBonusData getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index d086ebd6f2..1250fc6ffa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -278,7 +278,7 @@ public final class MultisellData implements IXmlReader separateAndSend(listId, player, npc, inventoryOnly, 1, 1); } - public static final boolean hasSpecialIngredient(int id, long amount, L2PcInstance player) + public static boolean hasSpecialIngredient(int id, long amount, L2PcInstance player) { switch (id) { @@ -310,7 +310,7 @@ public final class MultisellData implements IXmlReader return false; } - public static final boolean takeSpecialIngredient(int id, long amount, L2PcInstance player) + public static boolean takeSpecialIngredient(int id, long amount, L2PcInstance player) { switch (id) { @@ -329,7 +329,7 @@ public final class MultisellData implements IXmlReader return false; } - public static final void giveSpecialProduct(int id, long amount, L2PcInstance player) + public static void giveSpecialProduct(int id, long amount, L2PcInstance player) { switch (id) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 9a3a60777a..003503a3c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -111,7 +111,7 @@ public class SiegeScheduleData implements IXmlReader return _scheduleData; } - public static final SiegeScheduleData getInstance() + public static SiegeScheduleData getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 0f8fff2044..24024376dd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -998,7 +998,7 @@ public class AugmentationData return new L2Augmentation(((stat34 << 16) + stat12)); } - public static final AugmentationData getInstance() + public static AugmentationData getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java index 5bbf9b317e..4cc1249b43 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java @@ -100,7 +100,7 @@ public class MerchantPriceConfigTable implements InstanceListManager } } - final MerchantPriceConfig defaultMpc = this.getMerchantPriceConfig(defaultPriceConfigId); + final MerchantPriceConfig defaultMpc = getMerchantPriceConfig(defaultPriceConfigId); if (defaultMpc == null) { throw new IllegalStateException("'defaultPriceConfig' points to an non-loaded priceConfig"); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java index 56cd101752..3c498510b1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -1264,7 +1264,7 @@ public abstract class DocumentBase final char ch = value.isEmpty() ? ' ' : value.charAt(0); if ((ch == '#') || (ch == '-') || Character.isDigit(ch)) { - set.set(name, String.valueOf(getValue(value, level))); + set.set(name, getValue(value, level)); } else { 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 e03b2d4ddf..79022f5289 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 @@ -107,7 +107,7 @@ public final class CastleManorManager implements IXmlReader, IStorable // Send debug message if (Config.DEBUG) { - LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode.toString()); + LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode); } } else @@ -432,7 +432,7 @@ public final class CastleManorManager implements IXmlReader, IStorable scheduleModeChange(); if (Config.DEBUG) { - LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode.toString() + "!"); + LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode + "!"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index 005c1f3b4e..d9532675ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -176,7 +176,7 @@ public final class ClanHallAuctionManager } } - public static final ClanHallAuctionManager getInstance() + public static ClanHallAuctionManager getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java index 932a67435f..9f24419693 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -219,7 +219,7 @@ public final class DuelManager return ARENAS.get(Rnd.get(ARENAS.size())); } - public static final DuelManager getInstance() + public static DuelManager getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java index 9f4a06c09d..544a3fc517 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java @@ -167,7 +167,7 @@ public class RaidBossPointsManager return tmpRanking; } - public static final RaidBossPointsManager getInstance() + public static RaidBossPointsManager getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java index 44634ef583..478e1f78f5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java @@ -72,7 +72,7 @@ public class ServerRestartManager { nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime()); ThreadPoolManager.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000)); - _log.info("Scheduled server restart at " + lastRestart.getTime().toString() + "."); + _log.info("Scheduled server restart at " + lastRestart.getTime() + "."); } } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java index f06e2f4e71..ca13385589 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java @@ -204,7 +204,7 @@ public final class SoDManager * Gets the single instance of {@code GraciaSeedsManager}. * @return single instance of {@code GraciaSeedsManager} */ - public static final SoDManager getInstance() + public static SoDManager getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java index 9bd8935741..d86c57ee60 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java @@ -251,7 +251,7 @@ public class SoIManager * Gets the single instance of {@code GraciaSeedsManager}. * @return single instance of {@code GraciaSeedsManager} */ - public static final SoIManager getInstance() + public static SoIManager getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java index 5f4b39ff3e..ac0a3f49d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java @@ -1789,7 +1789,7 @@ public final class TerritoryWarManager implements Siegable } - public static final TerritoryWarManager getInstance() + public static TerritoryWarManager getInstance() { return SingletonHolder._instance; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java index a8594b3069..6ad8cf4fc3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -2171,7 +2171,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param itemObjId the item object ID * @return if the item has a reuse time stamp, the remaining time, otherwise -1 */ - public synchronized final long getItemRemainingReuseTime(int itemObjId) + public final synchronized long getItemRemainingReuseTime(int itemObjId) { final TimeStamp reuseStamp = (_reuseTimeStampsItems != null) ? _reuseTimeStampsItems.get(itemObjId) : null; return reuseStamp != null ? reuseStamp.getRemaining() : -1; @@ -2242,7 +2242,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * Removes a skill reuse time stamp. * @param skill the skill to remove */ - public synchronized final void removeTimeStamp(Skill skill) + public final synchronized void removeTimeStamp(Skill skill) { if (_reuseTimeStampsSkills != null) { @@ -2253,7 +2253,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** * Removes all skill reuse time stamps. */ - public synchronized final void resetTimeStamps() + public final synchronized void resetTimeStamps() { if (_reuseTimeStampsSkills != null) { @@ -2266,7 +2266,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param hashCode the skill hash code * @return if the skill has a reuse time stamp, the remaining time, otherwise -1 */ - public synchronized final long getSkillRemainingReuseTime(int hashCode) + public final synchronized long getSkillRemainingReuseTime(int hashCode) { final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null; return reuseStamp != null ? reuseStamp.getRemaining() : -1; @@ -2277,7 +2277,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param hashCode the skill hash code * @return {@code true} if the skill is under reuse time, {@code false} otherwise */ - public synchronized final boolean hasSkillReuse(int hashCode) + public final synchronized boolean hasSkillReuse(int hashCode) { final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null; return (reuseStamp != null) && reuseStamp.hasNotPassed(); @@ -2288,7 +2288,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param hashCode the skill hash code * @return if the skill has a reuse time stamp, the skill reuse time stamp, otherwise {@code null} */ - public synchronized final TimeStamp getSkillReuseTimeStamp(int hashCode) + public final synchronized TimeStamp getSkillReuseTimeStamp(int hashCode) { return _reuseTimeStampsSkills != null ? _reuseTimeStampsSkills.get(hashCode) : null; } @@ -2345,7 +2345,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** * Removes all the disabled skills. */ - public synchronized final void resetDisabledSkills() + public final synchronized void resetDisabledSkills() { if (_disabledSkills != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java index f9ce06613a..006650002a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java @@ -113,7 +113,7 @@ public final class L2AuctioneerInstance extends L2Npc final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); html.replace("%x%", val); - html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); + html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MIN%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getDesc()); @@ -181,8 +181,8 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10)); html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); - html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); - html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes"); + html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); + html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -424,8 +424,8 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10)); html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); - html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); - html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes"); + html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); + html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -455,8 +455,8 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10)); html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); - html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); - html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes"); + html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); + html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -613,7 +613,7 @@ public final class L2AuctioneerInstance extends L2Npc { html.replace("%AGIT_AUCTION_BID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); - html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); + html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate())); html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems"); html.replace("npc_%objectId%_bid1", "npc_" + getObjectId() + "_bid1 " + a.getId()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java index dd84920280..6e182b15e5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java @@ -61,7 +61,7 @@ public class L2BlockInstance extends L2MonsterInstance // Change color _colorEffect = 0x00; // BroadCast to all known players - this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker)); + broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker)); increaseTeamPointsAndSend(attacker, team, event); } else @@ -69,7 +69,7 @@ public class L2BlockInstance extends L2MonsterInstance // Change color _colorEffect = 0x53; // BroadCast to all known players - this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker)); + broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker)); increaseTeamPointsAndSend(attacker, team, event); } // 30% chance to drop the event items diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java index 6d771a369a..2c284afadb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java @@ -334,9 +334,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall." + String.valueOf(percent) + "%"); - html.replace("%apply%", "recovery hp " + String.valueOf(percent)); + html.replace("%cost%", cost + "Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall." + percent + "%"); + html.replace("%apply%", "recovery hp " + percent); sendHtmlMessage(player, html); return; } @@ -366,9 +366,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_MPREG5_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall." + String.valueOf(percent) + "%"); - html.replace("%apply%", "recovery mp " + String.valueOf(percent)); + html.replace("%cost%", cost + "Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall." + percent + "%"); + html.replace("%apply%", "recovery mp " + percent); sendHtmlMessage(player, html); return; } @@ -404,9 +404,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_EXPREG7_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall." + String.valueOf(percent) + "%"); - html.replace("%apply%", "recovery exp " + String.valueOf(percent)); + html.replace("%cost%", cost + "Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall." + percent + "%"); + html.replace("%apply%", "recovery exp " + percent); sendHtmlMessage(player, html); return; } @@ -427,7 +427,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", String.valueOf(val) + "%"); + html.replace("%val%", val + "%"); sendHtmlMessage(player, html); return; } @@ -509,7 +509,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", String.valueOf(val) + "%"); + html.replace("%val%", val + "%"); sendHtmlMessage(player, html); return; } @@ -567,7 +567,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", String.valueOf(val) + "%"); + html.replace("%val%", val + "%"); sendHtmlMessage(player, html); return; } @@ -631,7 +631,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final String mp_grade3 = "[5%][15%][30%][40%]"; if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null) { - html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "% (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -673,7 +673,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null) { - html.replace("%exp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "% (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -715,7 +715,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null) { - html.replace("%mp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "% (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "% (" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -811,9 +811,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_ITEM3_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%cost%", cost + "Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Allow the purchase of special items at fixed intervals."); - html.replace("%apply%", "other item " + String.valueOf(stage)); + html.replace("%apply%", "other item " + stage); sendHtmlMessage(player, html); return; } @@ -852,9 +852,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_SUPPORT8_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%cost%", cost + "Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Enables the use of supplementary magic."); - html.replace("%apply%", "other support " + String.valueOf(stage)); + html.replace("%apply%", "other support " + stage); sendHtmlMessage(player, html); return; } @@ -875,9 +875,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_TELE2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Teleports clan members in a clan hall to the target Stage " + String.valueOf(stage) + " staging area"); - html.replace("%apply%", "other tele " + String.valueOf(stage)); + html.replace("%cost%", cost + "Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Teleports clan members in a clan hall to the target Stage " + stage + " staging area"); + html.replace("%apply%", "other tele " + stage); sendHtmlMessage(player, html); return; } @@ -902,7 +902,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -955,7 +955,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -1004,7 +1004,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -1065,7 +1065,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final String item = "[Level 1][Level 2][Level 3]"; if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null) { - html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime())); html.replace("%change_tele%", "[Deactivate]" + tele); } @@ -1077,7 +1077,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null) { - html.replace("%support%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime())); final int grade = getClanHall().getGrade(); switch (grade) @@ -1119,7 +1119,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null) { - html.replace("%item%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()) + "Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime())); html.replace("%change_item%", "[Deactivate]" + item); } @@ -1174,9 +1174,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_CURTAIN2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%cost%", cost + "Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "These curtains can be used to decorate the clan hall."); - html.replace("%apply%", "deco curtains " + String.valueOf(stage)); + html.replace("%apply%", "deco curtains " + stage); sendHtmlMessage(player, html); return; } @@ -1197,9 +1197,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance cost = Config.CH_FRONT2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%cost%", cost + "Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Used to decorate the clan hall."); - html.replace("%apply%", "deco fixtures " + String.valueOf(stage)); + html.replace("%apply%", "deco fixtures " + stage); sendHtmlMessage(player, html); return; } @@ -1220,7 +1220,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -1269,7 +1269,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -1308,7 +1308,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance final String fixtures = "[Level 1][Level 2]"; if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null) { - html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime())); html.replace("%change_curtain%", "[Deactivate]" + curtains); } @@ -1320,7 +1320,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance } if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null) { - html.replace("%fixture%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl()) + " (" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease()) + "Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + " (" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime())); html.replace("%change_fixture%", "[Deactivate]" + fixtures); } 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 13f183f72d..d170a6fc70 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 @@ -133,7 +133,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance } } - public static final void onTutorialLink(L2PcInstance player, String request) + public static void onTutorialLink(L2PcInstance player, String request) { if (!Config.ALTERNATE_CLASS_MASTER || (request == null) || !request.startsWith("CO")) { @@ -156,7 +156,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(TutorialCloseHtml.STATIC_PACKET); } - public static final void onTutorialQuestionMark(L2PcInstance player, int number) + public static void onTutorialQuestionMark(L2PcInstance player, int number) { if (!Config.ALTERNATE_CLASS_MASTER || (number != 1001)) { @@ -166,7 +166,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance showTutorialHtml(player); } - public static final void showQuestionMark(L2PcInstance player) + public static void showQuestionMark(L2PcInstance player) { if (!Config.ALTERNATE_CLASS_MASTER) { @@ -187,7 +187,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(new TutorialShowQuestionMark(1001)); } - private static final void showHtmlMenu(L2PcInstance player, int objectId, int level) + private static void showHtmlMenu(L2PcInstance player, int objectId, int level) { final NpcHtmlMessage html = new NpcHtmlMessage(objectId); @@ -308,7 +308,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(html); } - private static final void showTutorialHtml(L2PcInstance player) + private static void showTutorialHtml(L2PcInstance player) { final ClassId currentClassId = player.getClassId(); if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE) @@ -337,7 +337,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(new TutorialShowHtml(msg)); } - private static final boolean checkAndChangeClass(L2PcInstance player, int val) + private static boolean checkAndChangeClass(L2PcInstance player, int val) { final ClassId currentClassId = player.getClassId(); if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE) @@ -409,7 +409,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance * @param level - current skillId level (0 - start, 1 - first, etc) * @return minimum player level required for next class transfer */ - private static final int getMinLevel(int level) + private static int getMinLevel(int level) { switch (level) { @@ -430,7 +430,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance * @param val new class index * @return */ - private static final boolean validateClassId(ClassId oldCID, int val) + private static boolean validateClassId(ClassId oldCID, int val) { return validateClassId(oldCID, ClassId.getClassId(val)); } @@ -441,7 +441,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance * @param newCID new ClassId * @return true if class change is possible */ - private static final boolean validateClassId(ClassId oldCID, ClassId newCID) + private static boolean validateClassId(ClassId oldCID, ClassId newCID) { if ((newCID == null) || (newCID.getRace() == null)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java index e9b5c50c5a..d50bdf0ffb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java @@ -204,7 +204,7 @@ public final class L2FestivalGuideInstance extends L2Npc player.sendPacket(ActionFailed.STATIC_PACKET); } - private static final String getStatsTable() + private static String getStatsTable() { final StringBuilder tableHtml = new StringBuilder(1000); @@ -225,13 +225,13 @@ public final class L2FestivalGuideInstance extends L2Npc winningCabal = "None"; } - tableHtml.append("" + festivalName + "" + String.valueOf(duskScore) + "" + String.valueOf(dawnScore) + "" + winningCabal + ""); + tableHtml.append("" + festivalName + "" + duskScore + "" + dawnScore + "" + winningCabal + ""); } return tableHtml.toString(); } - private static final String getBonusTable() + private static String getBonusTable() { final StringBuilder tableHtml = new StringBuilder(500); @@ -241,7 +241,7 @@ public final class L2FestivalGuideInstance extends L2Npc final int accumScore = SevenSignsFestival.getInstance().getAccumulatedBonus(i); final String festivalName = SevenSignsFestival.getFestivalName(i); - tableHtml.append("" + festivalName + "" + String.valueOf(accumScore) + ""); + tableHtml.append("" + festivalName + "" + accumScore + ""); } return tableHtml.toString(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index 65b15acbe6..747a17f7d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -414,9 +414,9 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Provides additional HP recovery for clan members in the fortress." + String.valueOf(percent) + "%"); - html.replace("%apply%", "recovery hp " + String.valueOf(percent)); + html.replace("%cost%", cost + "Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Provides additional HP recovery for clan members in the fortress." + percent + "%"); + html.replace("%apply%", "recovery hp " + percent); sendHtmlMessage(player, html); return; } @@ -437,9 +437,9 @@ public class L2FortManagerInstance extends L2MerchantInstance cost = Config.FS_MPREG2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Provides additional MP recovery for clan members in the fortress." + String.valueOf(percent) + "%"); - html.replace("%apply%", "recovery mp " + String.valueOf(percent)); + html.replace("%cost%", cost + "Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Provides additional MP recovery for clan members in the fortress." + percent + "%"); + html.replace("%apply%", "recovery mp " + percent); sendHtmlMessage(player, html); return; } @@ -460,9 +460,9 @@ public class L2FortManagerInstance extends L2MerchantInstance cost = Config.FS_EXPREG2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress." + String.valueOf(percent) + "%"); - html.replace("%apply%", "recovery exp " + String.valueOf(percent)); + html.replace("%cost%", cost + "Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress." + percent + "%"); + html.replace("%apply%", "recovery exp " + percent); sendHtmlMessage(player, html); return; } @@ -483,7 +483,7 @@ public class L2FortManagerInstance extends L2MerchantInstance if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm"); - html.replace("%val%", String.valueOf(val) + "%"); + html.replace("%val%", val + "%"); sendHtmlMessage(player, html); return; } @@ -528,7 +528,7 @@ public class L2FortManagerInstance extends L2MerchantInstance if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm"); - html.replace("%val%", String.valueOf(val) + "%"); + html.replace("%val%", val + "%"); sendHtmlMessage(player, html); return; } @@ -573,7 +573,7 @@ public class L2FortManagerInstance extends L2MerchantInstance if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm"); - html.replace("%val%", String.valueOf(val) + "%"); + html.replace("%val%", val + "%"); sendHtmlMessage(player, html); return; } @@ -609,7 +609,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final String mp = "[40%][50%]"; if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null) { - html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "% (" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime())); html.replace("%change_hp%", "[Deactivate]" + hp); } @@ -621,7 +621,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null) { - html.replace("%exp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()) + "% (" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease()) + "Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime())); html.replace("%change_exp%", "[Deactivate]" + exp); } @@ -633,7 +633,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null) { - html.replace("%mp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl()) + "% (" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease()) + "Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "% (" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime())); html.replace("%change_mp%", "[Deactivate]" + mp); } @@ -688,9 +688,9 @@ public class L2FortManagerInstance extends L2MerchantInstance cost = Config.FS_SUPPORT2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%cost%", cost + "Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%use%", "Enables the use of supplementary magic."); - html.replace("%apply%", "other support " + String.valueOf(stage)); + html.replace("%apply%", "other support " + stage); sendHtmlMessage(player, html); return; } @@ -711,9 +711,9 @@ public class L2FortManagerInstance extends L2MerchantInstance cost = Config.FS_TELE2_FEE; break; } - html.replace("%cost%", String.valueOf(cost) + "Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); - html.replace("%use%", "Teleports clan members in a fort to the target Stage " + String.valueOf(stage) + " staging area"); - html.replace("%apply%", "other tele " + String.valueOf(stage)); + html.replace("%cost%", cost + "Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); + html.replace("%use%", "Teleports clan members in a fort to the target Stage " + stage + " staging area"); + html.replace("%apply%", "other tele " + stage); sendHtmlMessage(player, html); return; } @@ -734,7 +734,7 @@ public class L2FortManagerInstance extends L2MerchantInstance if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -779,7 +779,7 @@ public class L2FortManagerInstance extends L2MerchantInstance if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val)) { html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm"); - html.replace("%val%", "Stage " + String.valueOf(val)); + html.replace("%val%", "Stage " + val); sendHtmlMessage(player, html); return; } @@ -817,7 +817,7 @@ public class L2FortManagerInstance extends L2MerchantInstance final String support = "[Level 1][Level 2]"; if (getFort().getFunction(Fort.FUNC_TELEPORT) != null) { - html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + " (" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + " (" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime())); html.replace("%change_tele%", "[Deactivate]" + tele); } @@ -829,7 +829,7 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (getFort().getFunction(Fort.FUNC_SUPPORT) != null) { - html.replace("%support%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLvl()) + " (" + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLease()) + "Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)"); + html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + " (" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)"); html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime())); html.replace("%change_support%", "[Deactivate]" + support); } @@ -897,7 +897,7 @@ public class L2FortManagerInstance extends L2MerchantInstance { if (!((skill.getMpConsume() + skill.getMpInitialConsume()) > getCurrentMp())) { - this.doCast(skill); + doCast(skill); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java index c182bea705..da20189975 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java @@ -176,7 +176,7 @@ public final class L2StaticObjectInstance extends L2Character public void setMeshIndex(int meshIndex) { _meshIndex = meshIndex; - this.broadcastPacket(new StaticObject(this)); + broadcastPacket(new StaticObject(this)); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 9728ce05e1..c55a05545f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -376,7 +376,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final StringBuilder content1 = new StringBuilder(200); for (PlayerClass subClass : subsAvailable) { - content1.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); + content1.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); } html.replace("%list%", content1.toString()); } @@ -418,7 +418,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final SubClass subClass = subList.next(); if (checkVillageMaster(subClass.getClassDefinition())) { - content2.append("" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); + content2.append("" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); } } @@ -451,7 +451,7 @@ public class L2VillageMasterInstance extends L2NpcInstance { final SubClass subClass = subList.next(); - content3.append("Sub-class " + String.valueOf(classIndex++) + "
" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); + content3.append("Sub-class " + classIndex++ + "
" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); } html.replace("%list%", content3.toString()); } @@ -613,7 +613,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final StringBuilder content6 = new StringBuilder(200); for (PlayerClass subClass : subsAvailable) { - content6.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); + content6.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); } switch (paramOne) @@ -879,12 +879,12 @@ public class L2VillageMasterInstance extends L2NpcInstance return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass); } - private static final Iterator iterSubClasses(L2PcInstance player) + private static Iterator iterSubClasses(L2PcInstance player) { return player.getSubClasses().values().iterator(); } - private static final void dissolveClan(L2PcInstance player, int clanId) + private static void dissolveClan(L2PcInstance player, int clanId) { if (!player.isClanLeader()) { @@ -945,7 +945,7 @@ public class L2VillageMasterInstance extends L2NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static final void recoverClan(L2PcInstance player, int clanId) + private static void recoverClan(L2PcInstance player, int clanId) { if (!player.isClanLeader()) { @@ -958,7 +958,7 @@ public class L2VillageMasterInstance extends L2NpcInstance clan.updateClanInDB(); } - private static final void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private static void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -1069,7 +1069,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } } - private static final void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName) + private static void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -1102,7 +1102,7 @@ public class L2VillageMasterInstance extends L2NpcInstance player.sendMessage("Pledge name changed."); } - private static final void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName) + private static void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { @@ -1165,7 +1165,7 @@ public class L2VillageMasterInstance extends L2NpcInstance * this displays PledgeSkillList to the player. * @param player */ - public static final void showPledgeSkillList(L2PcInstance player) + public static void showPledgeSkillList(L2PcInstance player) { if (!player.isClanLeader()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java index 930aef7fb4..00f1d97fb5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java @@ -299,7 +299,7 @@ public enum PlayerClass return subclasses; } - public static final EnumSet getSet(Race race, ClassLevel level) + public static EnumSet getSet(Race race, ClassLevel level) { final EnumSet allOf = EnumSet.noneOf(PlayerClass.class); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/drops/IDropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/drops/IDropItem.java index a740085bf4..61af421107 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/drops/IDropItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/drops/IDropItem.java @@ -32,5 +32,5 @@ public interface IDropItem * @param killer the killer * @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise */ - public Collection calculateDrops(L2Character victim, L2Character killer); + Collection calculateDrops(L2Character victim, L2Character killer); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 71b0da53d3..a618b08f25 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -170,7 +170,7 @@ public class FortSiege implements Siegable } else { - _log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + String.valueOf(_time)); + _log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time); } } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index 3e4e4568ec..5294226cf8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -411,7 +411,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable { cancelSiegeTask(); _siegeTask = ThreadPoolManager.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - 3600000); - _log.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime().toString() + "."); + _log.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + "."); } public void cancelSiegeTask() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index cfdadbe8f8..aaf5aa5479 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -400,7 +400,7 @@ public final class ItemAuctionInstance { if (!_auction.setAuctionState(state, ItemAuctionState.STARTED)) { - throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.STARTED.toString() + ", expected: " + state.toString()); + throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.STARTED + ", expected: " + state); } _log.log(Level.INFO, getClass().getSimpleName() + ": Auction " + _auction.getAuctionId() + " has started for instance " + _auction.getInstanceId()); @@ -454,7 +454,7 @@ public final class ItemAuctionInstance if (!_auction.setAuctionState(state, ItemAuctionState.FINISHED)) { - throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.FINISHED.toString() + ", expected: " + state.toString()); + throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.FINISHED + ", expected: " + state); } onAuctionFinished(_auction); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 886de0f128..c7775f9220 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -53,9 +53,9 @@ public abstract class Inventory extends ItemContainer public interface PaperdollListener { - public void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory); + void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory); - public void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory); + void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory); } // Common Items diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java index a80f671d65..2137a670e7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -1140,7 +1140,7 @@ public final class Skill implements IIdentifiable * @param sourceInArena * @return */ - public static final boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena) + public static boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena) { if ((target == null) || target.isDead() || (target == caster)) { @@ -1228,7 +1228,7 @@ public final class Skill implements IIdentifiable return true; } - public static final boolean addSummon(L2Character caster, L2PcInstance owner, int radius, boolean isDead) + public static boolean addSummon(L2Character caster, L2PcInstance owner, int radius, boolean isDead) { if (!owner.hasSummon()) { @@ -1237,7 +1237,7 @@ public final class Skill implements IIdentifiable return addCharacter(caster, owner.getSummon(), radius, isDead); } - public static final boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead) + public static boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead) { if (isDead != target.isDead()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java index 4118523a7b..95288908a9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java @@ -76,7 +76,7 @@ public enum BaseStats return 1; } - public static final BaseStats valueOfXml(String name) + public static BaseStats valueOfXml(String name) { name = name.intern(); for (BaseStats s : values()) @@ -91,7 +91,7 @@ public enum BaseStats private interface BaseStat { - public double calcBonus(L2Character actor); + double calcBonus(L2Character actor); } protected static final class STR implements BaseStat diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java index b8a3003ed7..fdf63dfc6c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -247,7 +247,7 @@ public final class Formulas * @param cha * @return */ - public static final double calcHpRegen(L2Character cha) + public static double calcHpRegen(L2Character cha) { double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseHpRegen(cha.getLevel()) : cha.getTemplate().getBaseHpReg(); double hpRegenMultiplier = cha.isRaid() ? Config.RAID_HP_REGEN_MULTIPLIER : Config.HP_REGEN_MULTIPLIER; @@ -368,7 +368,7 @@ public final class Formulas * @param cha * @return */ - public static final double calcMpRegen(L2Character cha) + public static double calcMpRegen(L2Character cha) { double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseMpRegen(cha.getLevel()) : cha.getTemplate().getBaseMpReg(); double mpRegenMultiplier = cha.isRaid() ? Config.RAID_MP_REGEN_MULTIPLIER : Config.MP_REGEN_MULTIPLIER; @@ -476,7 +476,7 @@ public final class Formulas * @param player the player * @return the CP regeneration rate */ - public static final double calcCpRegen(L2PcInstance player) + public static double calcCpRegen(L2PcInstance player) { // With CON bonus final double init = player.getActingPlayer().getTemplate().getBaseCpRegen(player.getLevel()) * player.getLevelMod() * BaseStats.CON.calcBonus(player); @@ -496,7 +496,7 @@ public final class Formulas return player.calcStat(Stats.REGENERATE_CP_RATE, Math.max(1, init), null, null) * cpRegenMultiplier; } - public static final double calcFestivalRegenModifier(L2PcInstance activeChar) + public static double calcFestivalRegenModifier(L2PcInstance activeChar) { final int[] festivalInfo = SevenSignsFestival.getInstance().getFestivalForPlayer(activeChar); final int oracle = festivalInfo[0]; @@ -530,7 +530,7 @@ public final class Formulas return 1.0 - (distToCenter * 0.0005); // Maximum Decreased Regen of ~ -65%; } - public static final double calcSiegeRegenModifier(L2PcInstance activeChar) + public static double calcSiegeRegenModifier(L2PcInstance activeChar) { if ((activeChar == null) || (activeChar.getClan() == null)) { @@ -744,7 +744,7 @@ public final class Formulas * @param ss if weapon item was charged by soulshot * @return */ - public static final double calcPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss) + public static double calcPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss) { final boolean isPvP = attacker.isPlayable() && target.isPlayable(); final boolean isPvE = attacker.isPlayable() && target.isAttackable(); @@ -890,7 +890,7 @@ public final class Formulas return damage; } - public static final double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit) + public static double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit) { double mDef = target.getMDef(attacker, skill); switch (shld) @@ -999,7 +999,7 @@ public final class Formulas return damage; } - public static final double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld) + public static double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld) { double mDef = target.getMDef(attacker.getOwner(), skill); switch (shld) @@ -1085,7 +1085,7 @@ public final class Formulas return damage; } - public static final boolean calcCrit(L2Character attacker, L2Character target) + public static boolean calcCrit(L2Character attacker, L2Character target) { return calcCrit(attacker, target, null); } @@ -1097,7 +1097,7 @@ public final class Formulas * @param skill * @return */ - public static final boolean calcCrit(L2Character attacker, L2Character target, Skill skill) + public static boolean calcCrit(L2Character attacker, L2Character target, Skill skill) { double rate = 0.d; if (skill != null) @@ -1111,7 +1111,7 @@ public final class Formulas return (target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE, rate, null, null) + target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE_ADD, 0, null, null)) > Rnd.get(1000); } - public static final boolean calcMCrit(double mRate) + public static boolean calcMCrit(double mRate) { return mRate > Rnd.get(1000); } @@ -1121,7 +1121,7 @@ public final class Formulas * @param dmg * @return true in case when ATTACK is canceled due to hit */ - public static final boolean calcAtkBreak(L2Character target, double dmg) + public static boolean calcAtkBreak(L2Character target, double dmg) { if (target.isChanneling()) { @@ -1170,7 +1170,7 @@ public final class Formulas * @param rate * @return */ - public static final int calcPAtkSpd(L2Character attacker, L2Character target, double rate) + public static int calcPAtkSpd(L2Character attacker, L2Character target, double rate) { // measured Oct 2006 by Tank6585, formula by Sami // attack speed 312 equals 1500 ms delay... (or 300 + 40 ms delay?) @@ -1188,7 +1188,7 @@ public final class Formulas * @param skillTime * @return */ - public static final int calcAtkSpd(L2Character attacker, Skill skill, double skillTime) + public static int calcAtkSpd(L2Character attacker, Skill skill, double skillTime) { if (skill.isMagic()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java index cc1aab51dd..8fc6ff821c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java @@ -105,7 +105,7 @@ public final class L2GamePacketHandler implements IPacketHandler, { if (Config.PACKET_HANDLER_DEBUG) { - _log.warning("Client: " + client.toString() + " sent a 0xd0 without the second opcode."); + _log.warning("Client: " + client + " sent a 0xd0 without the second opcode."); } break; } @@ -330,7 +330,7 @@ public final class L2GamePacketHandler implements IPacketHandler, { if (Config.PACKET_HANDLER_DEBUG) { - _log.warning("Client: " + client.toString() + " sent a 0x4a without the second opcode."); + _log.warning("Client: " + client + " sent a 0x4a without the second opcode."); } break; } @@ -703,7 +703,7 @@ public final class L2GamePacketHandler implements IPacketHandler, { if (Config.PACKET_HANDLER_DEBUG) { - _log.warning("Client: " + client.toString() + " sent a 0xd0 without the second opcode."); + _log.warning("Client: " + client + " sent a 0xd0 without the second opcode."); } break; } @@ -961,7 +961,7 @@ public final class L2GamePacketHandler implements IPacketHandler, } else { - _log.warning("Client: " + client.toString() + " sent a 0xd0:0x51 without the third opcode."); + _log.warning("Client: " + client + " sent a 0xd0:0x51 without the third opcode."); break; } switch (id3) @@ -1168,7 +1168,7 @@ public final class L2GamePacketHandler implements IPacketHandler, } final int size = buf.remaining(); - _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + " on State: " + state.name() + " Client: " + client.toString()); + _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + " on State: " + state.name() + " Client: " + client); final byte[] array = new byte[size]; buf.get(array); _log.warning(Util.printData(array, size)); @@ -1183,7 +1183,7 @@ public final class L2GamePacketHandler implements IPacketHandler, } final int size = buf.remaining(); - _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + ":0x" + Integer.toHexString(id2) + " on State: " + state.name() + " Client: " + client.toString()); + _log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + ":0x" + Integer.toHexString(id2) + " on State: " + state.name() + " Client: " + client); final byte[] array = new byte[size]; buf.get(array); _log.warning(Util.printData(array, size)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index f1a232858d..4490fefd90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -194,7 +194,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket _lifeStones.put(16178, new LifeStone(GRADE_ACC, 13)); } - protected static final LifeStone getLifeStone(int itemId) + protected static LifeStone getLifeStone(int itemId) { return _lifeStones.get(itemId); } @@ -207,7 +207,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param gemStones * @return */ - protected static final boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones) + protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones) { if (!isValid(player, item, refinerItem)) { @@ -249,7 +249,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param refinerItem * @return */ - protected static final boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem) + protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem) { if (!isValid(player, item)) { @@ -297,7 +297,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param item * @return */ - protected static final boolean isValid(L2PcInstance player, L2ItemInstance item) + protected static boolean isValid(L2PcInstance player, L2ItemInstance item) { if (!isValid(player)) { @@ -395,7 +395,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param player * @return */ - protected static final boolean isValid(L2PcInstance player) + protected static boolean isValid(L2PcInstance player) { if (player.getPrivateStoreType() != PrivateStoreType.NONE) { @@ -443,7 +443,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param itemGrade * @return GemStone itemId based on item grade */ - protected static final int getGemStoneId(CrystalType itemGrade) + protected static int getGemStoneId(CrystalType itemGrade) { switch (itemGrade) { @@ -467,7 +467,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param lifeStoneGrade * @return GemStone count based on item grade and life stone grade */ - protected static final int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade) + protected static int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade) { switch (lifeStoneGrade) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java index eaea6f77ea..52bb44b8b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java @@ -47,7 +47,7 @@ public abstract class L2GameClientPacket extends ReceivablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Client: " + getClient().toString() + " - Failed reading: " + getType() + " ; " + e.getMessage(), e); + _log.log(Level.SEVERE, "Client: " + getClient() + " - Failed reading: " + getType() + " ; " + e.getMessage(), e); if (e instanceof BufferUnderflowException) { @@ -84,7 +84,7 @@ public abstract class L2GameClientPacket extends ReceivablePacket } catch (Throwable t) { - _log.log(Level.SEVERE, "Client: " + getClient().toString() + " - Failed running: " + getType() + " ; " + t.getMessage(), t); + _log.log(Level.SEVERE, "Client: " + getClient() + " - Failed running: " + getType() + " ; " + t.getMessage(), t); // in case of EnterWorld error kick player from game if (this instanceof EnterWorld) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 86738daf8f..defe5427b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -311,7 +311,7 @@ public final class RequestBypassToServer extends L2GameClientPacket sb.append("StackTrace:"); for (StackTraceElement ste : e.getStackTrace()) { - sb.append(ste.toString() + ""); + sb.append(ste + ""); } sb.append(""); // item html diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 6de39ef179..14565e036f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -113,7 +113,7 @@ public final class Say2 extends L2GameClientPacket ChatType chatType = ChatType.findByClientId(_type); if (chatType == null) { - _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + String.valueOf(_text)); + _log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text); activeChar.sendPacket(ActionFailed.STATIC_PACKET); activeChar.logout(); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 0e9d69c7d9..241929f017 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -24,7 +24,7 @@ public class ExEnchantSkillResult extends L2GameServerPacket private static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true); private static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false); - public static final ExEnchantSkillResult valueOf(boolean result) + public static ExEnchantSkillResult valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index a1a46e474a..6174c16160 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -24,7 +24,7 @@ public class ExNoticePostArrived extends L2GameServerPacket private static final ExNoticePostArrived STATIC_PACKET_TRUE = new ExNoticePostArrived(true); private static final ExNoticePostArrived STATIC_PACKET_FALSE = new ExNoticePostArrived(false); - public static final ExNoticePostArrived valueOf(boolean result) + public static ExNoticePostArrived valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index abdb4fa11a..3ec65490e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -24,7 +24,7 @@ public class ExNoticePostSent extends L2GameServerPacket private static final ExNoticePostSent STATIC_PACKET_TRUE = new ExNoticePostSent(true); private static final ExNoticePostSent STATIC_PACKET_FALSE = new ExNoticePostSent(false); - public static final ExNoticePostSent valueOf(boolean result) + public static ExNoticePostSent valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/L2GameServerPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/L2GameServerPacket.java index a97dade903..d48d573ff7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/L2GameServerPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/L2GameServerPacket.java @@ -106,7 +106,7 @@ public abstract class L2GameServerPacket extends SendablePacket } catch (Exception e) { - _log.log(Level.SEVERE, "Client: " + getClient().toString() + " - Failed writing: " + getClass().getSimpleName() + " ; " + e.getMessage(), e); + _log.log(Level.SEVERE, "Client: " + getClient() + " - Failed writing: " + getClass().getSimpleName() + " ; " + e.getMessage(), e); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java index 23bd2ba5ec..fe8af498a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java @@ -21,7 +21,7 @@ public final class RestartResponse extends L2GameServerPacket private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true); private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false); - public static final RestartResponse valueOf(boolean result) + public static RestartResponse valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 3e2bbcee02..d2875cb289 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,7 +28,7 @@ public final class SystemMessage extends AbstractMessagePacket super(smId); } - public static final SystemMessage sendString(String text) + public static SystemMessage sendString(String text) { if (text == null) { @@ -40,7 +40,7 @@ public final class SystemMessage extends AbstractMessagePacket return sm; } - public static final SystemMessage getSystemMessage(SystemMessageId smId) + public static SystemMessage getSystemMessage(SystemMessageId smId) { SystemMessage sm = smId.getStaticSystemMessage(); if (sm != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java index 683a40e221..eea80e5165 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java @@ -148,7 +148,7 @@ public final class JavaExecutionContext extends AbstractExecutionContext diagnostic : fileManagerDiagnostics.getDiagnostics()) { - out.println("\t" + diagnostic.getKind().toString() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber()); + out.println("\t" + diagnostic.getKind() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber()); out.println("\t\tcode: " + diagnostic.getCode()); out.println("\t\tmessage: " + diagnostic.getMessage(null)); } @@ -159,7 +159,7 @@ public final class JavaExecutionContext extends AbstractExecutionContext diagnostic : compilationDiagnostics.getDiagnostics()) { - out.println("\t" + diagnostic.getKind().toString() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber()); + out.println("\t" + diagnostic.getKind() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber()); out.println("\t\tcode: " + diagnostic.getCode()); out.println("\t\tmessage: " + diagnostic.getMessage(null)); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java index 5f671ffc15..2b9ea5bdbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java @@ -47,7 +47,7 @@ public final class Evolve { protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); - public static final boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) + public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { if ((itemIdtake == 0) || (itemIdgive == 0) || (petminlvl == 0)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java index 2143c42c99..0c6a3d6e25 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java @@ -270,7 +270,7 @@ public final class Util String result = ""; for (T val : array) { - result += val.toString() + delim; + result += val + delim; } if (!result.isEmpty()) { @@ -442,7 +442,7 @@ public final class Util if (Config.HTML_ACTION_CACHE_DEBUG) { - LOGGER.info("Cached html bypass(" + scope.toString() + "): '" + bypass + "'"); + LOGGER.info("Cached html bypass(" + scope + "): '" + bypass + "'"); } player.addHtmlAction(scope, bypass); bypassStart = htmlLower.indexOf("=\"bypass ", bypassEnd); @@ -479,7 +479,7 @@ public final class Util if (Config.HTML_ACTION_CACHE_DEBUG) { - LOGGER.info("Cached html link(" + scope.toString() + "): '" + htmlLink + "'"); + LOGGER.info("Cached html link(" + scope + "): '" + htmlLink + "'"); } // let's keep an action cache with "link " lowercase literal kept player.addHtmlAction(scope, "link " + htmlLink); @@ -505,7 +505,7 @@ public final class Util if (Config.HTML_ACTION_CACHE_DEBUG) { - LOGGER.info("Set html action npc(" + scope.toString() + "): " + npcObjId); + LOGGER.info("Set html action npc(" + scope + "): " + npcObjId); } player.setHtmlActionOriginObjectId(scope, npcObjId); buildHtmlBypassCache(player, scope, html); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java index c358d9a62f..0862f9938a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java @@ -54,7 +54,7 @@ public class IPSubnet _mask = getMask(mask, _addr.length); if (!applyMask(_addr)) { - throw new UnknownHostException(addr.toString() + "/" + mask); + throw new UnknownHostException(addr + "/" + mask); } } @@ -114,7 +114,7 @@ public class IPSubnet try { - return InetAddress.getByAddress(_addr).toString() + "/" + size; + return InetAddress.getByAddress(_addr) + "/" + size; } catch (UnknownHostException e) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java index a8ed5b721f..f686787ed3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/NewbieGuide/NewbieGuide.java @@ -42,11 +42,11 @@ public class NewbieGuide extends AbstractNpcAI 30602, }; // Items - private final static ItemHolder SOULSHOT_REWARD = new ItemHolder(5789, 200); - private final static ItemHolder SPIRITSHOT_REWARD = new ItemHolder(5790, 100); + private static final ItemHolder SOULSHOT_REWARD = new ItemHolder(5789, 200); + private static final ItemHolder SPIRITSHOT_REWARD = new ItemHolder(5790, 100); // Other - private final static String TUTORIAL_QUEST = "Q00255_Tutorial"; - private final static String SUPPORT_MAGIC_STRING = ""; + private static final String TUTORIAL_QUEST = "Q00255_Tutorial"; + private static final String SUPPORT_MAGIC_STRING = ""; private NewbieGuide() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java index c8c8d84bf4..bc3e1a176d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java @@ -244,7 +244,7 @@ public class NpcLocationInfo extends AbstractNpcAI int npcId = npc.getId(); if (NPC.contains(npcId)) { - htmltext = String.valueOf(npcId) + ".htm"; + htmltext = npcId + ".htm"; } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java index e2cc7b5b80..3e1ac09aea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java @@ -60,7 +60,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%race%", npc.getTemplate().getRace().toString()); html.replace("%id%", String.valueOf(npc.getTemplate().getId())); html.replace("%lvl%", String.valueOf(npc.getTemplate().getLevel())); - html.replace("%name%", String.valueOf(npc.getTemplate().getName())); + html.replace("%name%", npc.getTemplate().getName()); html.replace("%tmplid%", String.valueOf(npc.getTemplate().getId())); html.replace("%aggro%", String.valueOf((target instanceof L2Attackable) ? ((L2Attackable) target).getAggroRange() : 0)); html.replace("%hp%", String.valueOf((int) npc.getCurrentHp())); @@ -86,7 +86,7 @@ public class L2NpcActionShift implements IActionShiftHandler html.replace("%int%", String.valueOf(npc.getINT())); html.replace("%wit%", String.valueOf(npc.getWIT())); html.replace("%men%", String.valueOf(npc.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(npc.getHeading())); html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); @@ -115,8 +115,8 @@ public class L2NpcActionShift implements IActionShiftHandler { final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); html.replace("%spawnfile%", fileName); - html.replace("%spawnname%", String.valueOf(template.getSpawnTemplate().getName())); - html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); + html.replace("%spawnname%", template.getSpawnTemplate().getName()); + html.replace("%spawngroup%", template.getGroup().getName()); if (template.getSpawnTemplate().getAI() != null) { final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); @@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler } else if (npc.getSpawn().hasRespawnRandom()) { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + String.valueOf((npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec")); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); } else { - html.replace("%resp%", String.valueOf(npc.getSpawn().getRespawnMinDelay() / 1000) + " sec"); + html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); } } else @@ -164,11 +164,11 @@ public class L2NpcActionShift implements IActionShiftHandler final String clansString = !clans.isEmpty() ? CommonUtil.implode(clans, ", ") : ""; final String ignoreClanNpcIdsString = ignoreClanNpcIds != null ? CommonUtil.implode(ignoreClanNpcIds, ", ") : ""; - html.replace("%ai_intention%", "
Intention:" + String.valueOf(npc.getAI().getIntention().name()) + "
"); + html.replace("%ai_intention%", "
Intention:" + npc.getAI().getIntention().name() + "
"); html.replace("%ai%", "
AI" + npc.getAI().getClass().getSimpleName() + "
"); - html.replace("%ai_type%", "
AIType" + String.valueOf(npc.getAiType()) + "
"); - html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + String.valueOf(npc.getTemplate().getClanHelpRange()) + "
"); - html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + String.valueOf(npc.getTemplate().getAggroRange()) + "
"); + html.replace("%ai_type%", "
AIType" + npc.getAiType() + "
"); + html.replace("%ai_clan%", "
Clan & Range:" + clansString + " " + npc.getTemplate().getClanHelpRange() + "
"); + html.replace("%ai_enemy_clan%", "
Ignore & Range:" + ignoreClanNpcIdsString + " " + npc.getTemplate().getAggroRange() + "
"); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java index 883150945a..c63cafe753 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java @@ -109,7 +109,7 @@ public class AdminShutdown implements IAdminCommandHandler adminReply.setFile(activeChar.getHtmlPrefix(), "data/html/admin/shutdown.htm"); adminReply.replace("%count%", String.valueOf(L2World.getInstance().getPlayers().size())); 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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 7b1bcbfc56..6f2671122b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -73,8 +73,8 @@ public class Premium implements IVoicedCommandHandler html.append("Drop Amount: x" + (Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_DROP_AMOUNT) + " "); html.append("Spoil Chance: x" + (Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_CHANCE) + " "); html.append("Spoil Amount: x" + (Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER * Config.PREMIUM_RATE_SPOIL_AMOUNT) + " "); - html.append("Expires: " + String.valueOf(format.format(endDate)) + ""); - html.append("Current Date: " + String.valueOf(format.format(System.currentTimeMillis())) + "

"); + html.append("Expires: " + format.format(endDate) + ""); + html.append("Current Date: " + format.format(System.currentTimeMillis()) + "

"); html.append("
Premium Info & Rules
"); html.append("1. Premium accounts CAN NOT BE TRANSFERED."); html.append("2. Premium does not effect party members."); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index 6515a983b0..d32c1de5e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -55,7 +55,7 @@ import com.l2jmobius.gameserver.network.serverpackets.TutorialShowQuestionMark; public class Q00255_Tutorial extends Quest { // NPCs - private final static List NEWBIE_HELPERS = new ArrayList<>(); + private static final List NEWBIE_HELPERS = new ArrayList<>(); { NEWBIE_HELPERS.add(30009); // human fighter NEWBIE_HELPERS.add(30019); // human mystic @@ -64,7 +64,7 @@ public class Q00255_Tutorial extends Quest NEWBIE_HELPERS.add(30575); // orc NEWBIE_HELPERS.add(30530); // dwarf } - private final static List SUPERVISORS = new ArrayList<>(); + private static final List SUPERVISORS = new ArrayList<>(); { SUPERVISORS.add(30008); // human fighter SUPERVISORS.add(30017); // human mystic @@ -74,15 +74,15 @@ public class Q00255_Tutorial extends Quest SUPERVISORS.add(30528); // dwarf } // Monsters - private final static int[] GREMLINS = + private static final int[] GREMLINS = { 18342, // this is used for now 20001 }; // Items - private final static int BLUE_GEM = 6353; - private final static ItemHolder SOULSHOT_REWARD = new ItemHolder(5789, 200); - private final static ItemHolder SPIRITSHOT_REWARD = new ItemHolder(5790, 100); + private static final int BLUE_GEM = 6353; + private static final ItemHolder SOULSHOT_REWARD = new ItemHolder(5789, 200); + private static final ItemHolder SPIRITSHOT_REWARD = new ItemHolder(5790, 100); // Others private static final Map STARTING_VOICE_HTML = new HashMap<>(); { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java index 24499ae4fd..5285b7941d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.model.quest.State; */ 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; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index 8c667e7328..172df62e96 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -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)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index e2d2ca2351..5b1d70f583 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -387,7 +387,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final StringBuilder content1 = new StringBuilder(200); for (PlayerClass subClass : subsAvailable) { - content1.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); + content1.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); } html.replace("%list%", content1.toString()); } @@ -429,7 +429,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final SubClass subClass = subList.next(); if (checkVillageMaster(subClass.getClassDefinition())) { - content2.append("" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); + content2.append("" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); } } @@ -462,7 +462,7 @@ public class L2VillageMasterInstance extends L2NpcInstance { final SubClass subClass = subList.next(); - content3.append("Sub-class " + String.valueOf(classIndex++) + "
" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); + content3.append("Sub-class " + classIndex++ + "
" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "
"); } html.replace("%list%", content3.toString()); } @@ -625,7 +625,7 @@ public class L2VillageMasterInstance extends L2NpcInstance final StringBuilder content6 = new StringBuilder(200); for (PlayerClass subClass : subsAvailable) { - content6.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); + content6.append("" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "
"); } switch (paramOne) @@ -891,7 +891,7 @@ public class L2VillageMasterInstance extends L2NpcInstance return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass); } - private static final Iterator iterSubClasses(L2PcInstance player) + private static Iterator iterSubClasses(L2PcInstance player) { return player.getSubClasses().values().iterator(); }