Code review Part 3.

This commit is contained in:
MobiusDevelopment
2019-12-20 00:35:40 +00:00
parent 6954f58f5e
commit cd1f62cc68
2014 changed files with 9456 additions and 12142 deletions

View File

@@ -109,7 +109,7 @@ public class Nottingale extends AbstractNpcAI
case "32627-09.html":
case "32627-10.html":
{
player.sendPacket(RADARS.get(Integer.valueOf(event.substring(6, 8))));
player.sendPacket(RADARS.get(Integer.parseInt(event.substring(6, 8))));
htmltext = event;
break;
}

View File

@@ -235,7 +235,7 @@ public class Race extends Event
}
else
{
final int number = Integer.valueOf(bypass.substring(5));
final int number = Integer.parseInt(bypass.substring(5));
final Skill skill = SkillData.getInstance().getSkill(number, 1);
if (skill != null)
{
@@ -252,7 +252,7 @@ public class Race extends Event
}
else if (bypass.startsWith("tele"))
{
if ((Integer.valueOf(bypass.substring(4)) > 0) && (_randspawn != null))
if ((Integer.parseInt(bypass.substring(4)) > 0) && (_randspawn != null))
{
player.teleToLocation(_randspawn[0], _randspawn[1], _randspawn[2]);
}

View File

@@ -236,37 +236,37 @@ public class AdminAdmin implements IAdminCommandHandler
{
case "RateXp":
{
Config.RATE_XP = Float.valueOf(pValue);
Config.RATE_XP = Float.parseFloat(pValue);
break;
}
case "RateSp":
{
Config.RATE_SP = Float.valueOf(pValue);
Config.RATE_SP = Float.parseFloat(pValue);
break;
}
case "RateDropSpoil":
{
Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER = Float.valueOf(pValue);
Config.RATE_SPOIL_DROP_CHANCE_MULTIPLIER = Float.parseFloat(pValue);
break;
}
case "EnchantChanceElementStone":
{
Config.ENCHANT_CHANCE_ELEMENT_STONE = Float.valueOf(pValue);
Config.ENCHANT_CHANCE_ELEMENT_STONE = Float.parseFloat(pValue);
break;
}
case "EnchantChanceElementCrystal":
{
Config.ENCHANT_CHANCE_ELEMENT_CRYSTAL = Float.valueOf(pValue);
Config.ENCHANT_CHANCE_ELEMENT_CRYSTAL = Float.parseFloat(pValue);
break;
}
case "EnchantChanceElementJewel":
{
Config.ENCHANT_CHANCE_ELEMENT_JEWEL = Float.valueOf(pValue);
Config.ENCHANT_CHANCE_ELEMENT_JEWEL = Float.parseFloat(pValue);
break;
}
case "EnchantChanceElementEnergy":
{
Config.ENCHANT_CHANCE_ELEMENT_ENERGY = Float.valueOf(pValue);
Config.ENCHANT_CHANCE_ELEMENT_ENERGY = Float.parseFloat(pValue);
break;
}
}

View File

@@ -454,7 +454,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
final String token = st.nextToken();
if (Util.isDigit(token))
{
page = Integer.valueOf(token);
page = Integer.parseInt(token);
}
}

View File

@@ -64,7 +64,7 @@ import org.l2jmobius.gameserver.util.Util;
*/
public class AdminEditChar implements IAdminCommandHandler
{
private static Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminEditChar.class.getName());
private static final String[] ADMIN_COMMANDS =
{

View File

@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminEnchant implements IAdminCommandHandler
{
private static Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminEnchant.class.getName());
private static final String[] ADMIN_COMMANDS =
{

View File

@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminFortSiege implements IAdminCommandHandler
{
// private static Logger LOGGER = Logger.getLogger(AdminFortSiege.class.getName());
// private static final Logger LOGGER = Logger.getLogger(AdminFortSiege.class.getName());
private static final String[] ADMIN_COMMANDS =
{

View File

@@ -126,7 +126,7 @@ public class AdminGamePoints implements IAdminCommandHandler
return false;
}
final Long points = Long.valueOf(val);
final Long points = Long.parseLong(val);
if (points < 1)
{
admin.sendMessage("Invalid game point count.");
@@ -162,7 +162,7 @@ public class AdminGamePoints implements IAdminCommandHandler
return false;
}
final Long points = Long.valueOf(val);
final Long points = Long.parseLong(val);
if (points < 0)
{
admin.sendMessage("Invalid game point count.");
@@ -188,7 +188,7 @@ public class AdminGamePoints implements IAdminCommandHandler
return false;
}
final Long points = Long.valueOf(val);
final Long points = Long.parseLong(val);
if (points < 1)
{
admin.sendMessage("Invalid game point count.");

View File

@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminGm implements IAdminCommandHandler
{
private static Logger LOGGER = Logger.getLogger(AdminGm.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminGm.class.getName());
private static final String[] ADMIN_COMMANDS =
{
"admin_gm"

View File

@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminHeal implements IAdminCommandHandler
{
private static Logger LOGGER = Logger.getLogger(AdminRes.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminRes.class.getName());
private static final String[] ADMIN_COMMANDS =
{
"admin_heal"

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class AdminMonsterRace implements IAdminCommandHandler
{
// private static Logger LOGGER = Logger.getLogger(AdminMonsterRace.class.getName());
// private static final Logger LOGGER = Logger.getLogger(AdminMonsterRace.class.getName());
private static final String[] ADMIN_COMMANDS =
{

View File

@@ -66,7 +66,7 @@ public class AdminPcCondOverride implements IAdminCommandHandler
final String token = st.nextToken();
if (Util.isDigit(token))
{
final PlayerCondOverride ex = PlayerCondOverride.getCondOverride(Integer.valueOf(token));
final PlayerCondOverride ex = PlayerCondOverride.getCondOverride(Integer.parseInt(token));
if (ex != null)
{
if (activeChar.canOverrideCond(ex))

View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
*/
public class AdminRepairChar implements IAdminCommandHandler
{
private static Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminRepairChar.class.getName());
private static final String[] ADMIN_COMMANDS =
{

View File

@@ -50,7 +50,7 @@ public class AdminShutdown implements IAdminCommandHandler
final String val = command.substring(22);
if (Util.isDigit(val))
{
serverShutdown(activeChar, Integer.valueOf(val), false);
serverShutdown(activeChar, Integer.parseInt(val), false);
}
else
{

View File

@@ -58,7 +58,7 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminSkill implements IAdminCommandHandler
{
private static Logger LOGGER = Logger.getLogger(AdminSkill.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminSkill.class.getName());
private static final String[] ADMIN_COMMANDS =
{

View File

@@ -140,7 +140,7 @@ public class QuestLink implements IBypassHandler
String localisation = "<fstring>" + quest.getNpcStringId() + state + "</fstring>";
if (Config.MULTILANG_ENABLE)
{
final NpcStringId ns = NpcStringId.getNpcStringId(Integer.valueOf(quest.getNpcStringId() + state));
final NpcStringId ns = NpcStringId.getNpcStringId(Integer.parseInt(quest.getNpcStringId() + state));
if (ns != null)
{
final NSLocalisation nsl = ns.getLocalisation(player.getLang());
@@ -162,7 +162,7 @@ public class QuestLink implements IBypassHandler
String localisation = "<a action=\"bypass -h Quest Q00118_ToLeadAndBeLed sponsor\">[<fstring>" + questId + state + "</fstring> (Sponsor)]</a><br>";
if (Config.MULTILANG_ENABLE)
{
final NpcStringId ns = NpcStringId.getNpcStringId(Integer.valueOf(questId + state));
final NpcStringId ns = NpcStringId.getNpcStringId(Integer.parseInt(questId + state));
if (ns != null)
{
final NSLocalisation nsl = ns.getLocalisation(player.getLang());
@@ -180,7 +180,7 @@ public class QuestLink implements IBypassHandler
String localisation = "<a action=\"bypass -h Quest Q00123_TheLeaderAndTheFollower sponsor\">[<fstring>" + questId + state + "</fstring> (Sponsor)]</a><br>";
if (Config.MULTILANG_ENABLE)
{
final NpcStringId ns = NpcStringId.getNpcStringId(Integer.valueOf(questId + state));
final NpcStringId ns = NpcStringId.getNpcStringId(Integer.parseInt(questId + state));
if (ns != null)
{
final NSLocalisation nsl = ns.getLocalisation(player.getLang());

View File

@@ -83,7 +83,7 @@ public class PetFood implements IItemHandler
if (player.isMounted())
{
final List<Integer> foodIds = PetDataTable.getInstance().getPetData(player.getMountNpcId()).getFood();
if (foodIds.contains(Integer.valueOf(item.getId())))
if (foodIds.contains(item.getId()))
{
if (player.destroyItem("Consume", item.getObjectId(), 1, null, false))
{

View File

@@ -236,7 +236,7 @@ public class Q00255_Tutorial extends Quest
String voice = "";
for (String[] element : QTEXMTWO)
{
if (classId == Integer.valueOf(element[0]))
if (classId == Integer.parseInt(element[0]))
{
voice = element[1];
html = element[2];
@@ -264,7 +264,7 @@ public class Q00255_Tutorial extends Quest
cancelQuestTimers("TE");
if (!event.equalsIgnoreCase("TE"))
{
switch (Integer.valueOf(event.substring(2)))
switch (Integer.parseInt(event.substring(2)))
{
case 0:
{
@@ -391,12 +391,12 @@ public class Q00255_Tutorial extends Quest
int z = 0;
for (String[] element : CEEa)
{
if (classId == Integer.valueOf(element[0]))
if (classId == Integer.parseInt(element[0]))
{
html = element[1];
x = Integer.valueOf(element[2]);
y = Integer.valueOf(element[3]);
z = Integer.valueOf(element[4]);
x = Integer.parseInt(element[2]);
y = Integer.parseInt(element[3]);
z = Integer.parseInt(element[4]);
}
}
if (x != 0)
@@ -567,7 +567,7 @@ public class Q00255_Tutorial extends Quest
int x = 0;
int y = 0;
int z = 0;
switch (Integer.valueOf(event.substring(2)))
switch (Integer.parseInt(event.substring(2)))
{
case 1:
{
@@ -575,12 +575,12 @@ public class Q00255_Tutorial extends Quest
qs.set("Ex", "-5");
for (String[] element : CEEa)
{
if (classId == Integer.valueOf(element[0]))
if (classId == Integer.parseInt(element[0]))
{
html = element[1];
x = Integer.valueOf(element[2]);
y = Integer.valueOf(element[3]);
z = Integer.valueOf(element[4]);
x = Integer.parseInt(element[2]);
y = Integer.parseInt(element[3]);
z = Integer.parseInt(element[4]);
}
}
addRadar(player, x, y, z);
@@ -596,12 +596,12 @@ public class Q00255_Tutorial extends Quest
{
for (String[] element : CEEa)
{
if (classId == Integer.valueOf(element[0]))
if (classId == Integer.parseInt(element[0]))
{
// html = element[1];
x = Integer.valueOf(element[2]);
y = Integer.valueOf(element[3]);
z = Integer.valueOf(element[4]);
x = Integer.parseInt(element[2]);
y = Integer.parseInt(element[3]);
z = Integer.parseInt(element[4]);
}
}
addRadar(player, x, y, z);
@@ -623,12 +623,12 @@ public class Q00255_Tutorial extends Quest
{
for (String[] element : QMCa)
{
if (classId == Integer.valueOf(element[0]))
if (classId == Integer.parseInt(element[0]))
{
html = element[1];
x = Integer.valueOf(element[2]);
y = Integer.valueOf(element[3]);
z = Integer.valueOf(element[4]);
x = Integer.parseInt(element[2]);
y = Integer.parseInt(element[3]);
z = Integer.parseInt(element[4]);
}
}
if (x != 0)
@@ -646,12 +646,12 @@ public class Q00255_Tutorial extends Quest
{
for (String[] element : QMCa)
{
if (classId == Integer.valueOf(element[0]))
if (classId == Integer.parseInt(element[0]))
{
html = element[1];
x = Integer.valueOf(element[2]);
y = Integer.valueOf(element[3]);
z = Integer.valueOf(element[4]);
x = Integer.parseInt(element[2]);
y = Integer.parseInt(element[3]);
z = Integer.parseInt(element[4]);
}
}
if (x != 0)

View File

@@ -135,7 +135,7 @@ public class Q00617_GatherTheFlames extends Quest
{
return getNoQuestMsg(player);
}
giveItems(player, Integer.valueOf(event), 1);
giveItems(player, Integer.parseInt(event), 1);
takeItems(player, TORCH, 1200);
htmltext = "32049-04.html";
break;
@@ -147,7 +147,7 @@ public class Q00617_GatherTheFlames extends Quest
{
return getNoQuestMsg(player);
}
giveItems(player, Integer.valueOf(event), 1);
giveItems(player, Integer.parseInt(event), 1);
takeItems(player, TORCH, 1200);
htmltext = "32049-03.html";
break;

View File

@@ -378,7 +378,7 @@ public class Q00620_FourGoblets extends Quest
final int memoStateEx = qs.getMemoStateEx(1);
if (((memoStateEx == 2) || (memoStateEx == 3)) && (getQuestItemsCount(player, BROKEN_RELIC_PART) >= 1000))
{
giveItems(player, Integer.valueOf(event), 1);
giveItems(player, Integer.parseInt(event), 1);
takeItems(player, BROKEN_RELIC_PART, 1000);
htmltext = "31454-05.html";
}

View File

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

View File

@@ -131,7 +131,7 @@ public class Q10287_StoryOfThoseLeft extends Quest
{
if (qs.isMemoState(2))
{
rewardItems(player, Integer.valueOf(event), 1);
rewardItems(player, Integer.parseInt(event), 1);
htmltext = "32020-09.html";
qs.exitQuest(false, true);
}

View File

@@ -78,7 +78,7 @@ public class DwarfBlacksmithChange1 extends AbstractNpcAI
}
case "56":
{
htmltext = ClassChangeRequested(player, npc, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, npc, Integer.parseInt(event));
break;
}
}

View File

@@ -71,7 +71,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
}
case "57":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}

View File

@@ -78,7 +78,7 @@ public class DwarfWarehouseChange1 extends AbstractNpcAI
}
case "54":
{
htmltext = ClassChangeRequested(player, npc, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, npc, Integer.parseInt(event));
break;
}
}

View File

@@ -71,7 +71,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
}
case "55":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}

View File

@@ -83,7 +83,7 @@ public class ElfHumanClericChange2 extends AbstractNpcAI
case "17":
case "30":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}

View File

@@ -143,7 +143,7 @@ public class ElfHumanFighterChange1 extends AbstractNpcAI
case "19":
case "22":
{
htmltext = ClassChangeRequested(player, npc, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, npc, Integer.parseInt(event));
break;
}
}

View File

@@ -130,7 +130,7 @@ public class ElfHumanFighterChange2 extends AbstractNpcAI
case "23":
case "24":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}

View File

@@ -143,7 +143,7 @@ public class ElfHumanWizardChange1 extends AbstractNpcAI
case "26":
case "29":
{
htmltext = ClassChangeRequested(player, npc, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, npc, Integer.parseInt(event));
break;
}
}

View File

@@ -96,7 +96,7 @@ public class ElfHumanWizardChange2 extends AbstractNpcAI
case "27":
case "28":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}

View File

@@ -76,7 +76,7 @@ public class KamaelChange1 extends AbstractNpcAI
case "125":
case "126":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}

View File

@@ -101,7 +101,7 @@ public class KamaelChange2 extends AbstractNpcAI
case "129":
case "130":
{
htmltext = ClassChangeRequested(player, npc, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, npc, Integer.parseInt(event));
break;
}
}

View File

@@ -97,7 +97,7 @@ public class OrcChange1 extends AbstractNpcAI
case "47":
case "50":
{
htmltext = ClassChangeRequested(player, npc, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, npc, Integer.parseInt(event));
break;
}
}

View File

@@ -92,7 +92,7 @@ public class OrcChange2 extends AbstractNpcAI
case "51":
case "52":
{
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
break;
}
}