Code review Part 3.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class CharacterBirthday extends AbstractNpcAI
|
||||
now.setTimeInMillis(System.currentTimeMillis());
|
||||
// Check if already received reward
|
||||
String nextBirthday = st.get("Birthday");
|
||||
if ((nextBirthday != null) && (Integer.valueOf(nextBirthday) > now.get(Calendar.YEAR)))
|
||||
if ((nextBirthday != null) && (Integer.parseInt(nextBirthday) > now.get(Calendar.YEAR)))
|
||||
{
|
||||
htmltext = "32600-already.htm";
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -63,7 +63,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 =
|
||||
{
|
||||
|
||||
@@ -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 =
|
||||
{
|
||||
|
||||
@@ -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 =
|
||||
{
|
||||
|
||||
@@ -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.");
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 =
|
||||
{
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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 =
|
||||
{
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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 =
|
||||
{
|
||||
|
||||
@@ -137,10 +137,10 @@ public class QuestLink implements IBypassHandler
|
||||
}
|
||||
else
|
||||
{
|
||||
String localisation = NpcStringId.getNpcStringId(Integer.valueOf(quest.getNpcStringId() + state)).getText();
|
||||
String localisation = NpcStringId.getNpcStringId(Integer.parseInt(quest.getNpcStringId() + state)).getText();
|
||||
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());
|
||||
@@ -159,10 +159,10 @@ public class QuestLink implements IBypassHandler
|
||||
{
|
||||
if (questId == TO_LEAD_AND_BE_LED)
|
||||
{
|
||||
String localisation = "<a action=\"bypass -h Quest Q00118_ToLeadAndBeLed sponsor\">[" + NpcStringId.getNpcStringId(Integer.valueOf(questId + state)).getText() + " (Sponsor)]</a><br>";
|
||||
String localisation = "<a action=\"bypass -h Quest Q00118_ToLeadAndBeLed sponsor\">[" + NpcStringId.getNpcStringId(Integer.parseInt(questId + state)).getText() + " (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());
|
||||
@@ -177,10 +177,10 @@ public class QuestLink implements IBypassHandler
|
||||
|
||||
if (questId == THE_LEADER_AND_THE_FOLLOWER)
|
||||
{
|
||||
String localisation = "<a action=\"bypass -h Quest Q00123_TheLeaderAndTheFollower sponsor\">[" + NpcStringId.getNpcStringId(Integer.valueOf(questId + state)).getText() + " (Sponsor)]</a><br>";
|
||||
String localisation = "<a action=\"bypass -h Quest Q00123_TheLeaderAndTheFollower sponsor\">[" + NpcStringId.getNpcStringId(Integer.parseInt(questId + state)).getText() + " (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());
|
||||
|
||||
@@ -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))
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public class DwarfBlacksmithChange2 extends AbstractNpcAI
|
||||
}
|
||||
case "57":
|
||||
{
|
||||
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
|
||||
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public class DwarfWarehouseChange2 extends AbstractNpcAI
|
||||
}
|
||||
case "55":
|
||||
{
|
||||
htmltext = ClassChangeRequested(player, Integer.valueOf(event));
|
||||
htmltext = ClassChangeRequested(player, Integer.parseInt(event));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2241,7 +2241,7 @@ public class Config
|
||||
LIST_PET_RENT_NPC = new ArrayList<>(listPetRentNpc.length);
|
||||
for (String id : listPetRentNpc)
|
||||
{
|
||||
LIST_PET_RENT_NPC.add(Integer.valueOf(id));
|
||||
LIST_PET_RENT_NPC.add(Integer.parseInt(id));
|
||||
}
|
||||
RAID_HP_REGEN_MULTIPLIER = NPC.getDouble("RaidHpRegenMultiplier", 100) / 100;
|
||||
RAID_MP_REGEN_MULTIPLIER = NPC.getDouble("RaidMpRegenMultiplier", 100) / 100;
|
||||
@@ -2264,7 +2264,7 @@ public class Config
|
||||
|
||||
try
|
||||
{
|
||||
MINIONS_RESPAWN_TIME.put(Integer.valueOf(propSplit[0]), Integer.valueOf(propSplit[1]));
|
||||
MINIONS_RESPAWN_TIME.put(Integer.parseInt(propSplit[0]), Integer.parseInt(propSplit[1]));
|
||||
}
|
||||
catch (NumberFormatException nfe)
|
||||
{
|
||||
@@ -2359,7 +2359,7 @@ public class Config
|
||||
{
|
||||
try
|
||||
{
|
||||
RATE_DROP_AMOUNT_BY_ID.put(Integer.valueOf(itemSplit[0]), Float.valueOf(itemSplit[1]));
|
||||
RATE_DROP_AMOUNT_BY_ID.put(Integer.parseInt(itemSplit[0]), Float.parseFloat(itemSplit[1]));
|
||||
}
|
||||
catch (NumberFormatException nfe)
|
||||
{
|
||||
@@ -2387,7 +2387,7 @@ public class Config
|
||||
{
|
||||
try
|
||||
{
|
||||
RATE_DROP_CHANCE_BY_ID.put(Integer.valueOf(itemSplit[0]), Float.valueOf(itemSplit[1]));
|
||||
RATE_DROP_CHANCE_BY_ID.put(Integer.parseInt(itemSplit[0]), Float.parseFloat(itemSplit[1]));
|
||||
}
|
||||
catch (NumberFormatException nfe)
|
||||
{
|
||||
@@ -2815,7 +2815,7 @@ public class Config
|
||||
final PropertiesParser FactionSystem = new PropertiesParser(CUSTOM_FACTION_SYSTEM_CONFIG_FILE);
|
||||
|
||||
String[] tempString;
|
||||
FACTION_SYSTEM_ENABLED = Boolean.valueOf(FactionSystem.getBoolean("EnableFactionSystem", false));
|
||||
FACTION_SYSTEM_ENABLED = FactionSystem.getBoolean("EnableFactionSystem", false);
|
||||
tempString = FactionSystem.getString("StartingLocation", "85332,16199,-1252").split(",");
|
||||
FACTION_STARTING_LOCATION = new Location(Integer.parseInt(tempString[0]), Integer.parseInt(tempString[1]), Integer.parseInt(tempString[2]));
|
||||
tempString = FactionSystem.getString("ManagerSpawnLocation", "85712,15974,-1260,26808").split(",");
|
||||
@@ -2837,16 +2837,16 @@ public class Config
|
||||
|
||||
// Load FakePlayers config file (if exists)
|
||||
final PropertiesParser FakePlayers = new PropertiesParser(CUSTOM_FAKE_PLAYERS_CONFIG_FILE);
|
||||
FAKE_PLAYERS_ENABLED = Boolean.valueOf(FakePlayers.getBoolean("EnableFakePlayers", false));
|
||||
FAKE_PLAYER_CHAT = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerChat", false));
|
||||
FAKE_PLAYER_USE_SHOTS = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerUseShots", false));
|
||||
FAKE_PLAYER_KILL_PVP = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerKillsRewardPvP", false));
|
||||
FAKE_PLAYER_KILL_KARMA = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerUnflaggedKillsKarma", false));
|
||||
FAKE_PLAYER_AGGRO_MONSTERS = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerAggroMonsters", false));
|
||||
FAKE_PLAYER_AGGRO_PLAYERS = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerAggroPlayers", false));
|
||||
FAKE_PLAYER_AGGRO_FPC = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerAggroFPC", false));
|
||||
FAKE_PLAYER_CAN_DROP_ITEMS = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerCanDropItems", false));
|
||||
FAKE_PLAYER_CAN_PICKUP = Boolean.valueOf(FakePlayers.getBoolean("FakePlayerCanPickup", false));
|
||||
FAKE_PLAYERS_ENABLED = FakePlayers.getBoolean("EnableFakePlayers", false);
|
||||
FAKE_PLAYER_CHAT = FakePlayers.getBoolean("FakePlayerChat", false);
|
||||
FAKE_PLAYER_USE_SHOTS = FakePlayers.getBoolean("FakePlayerUseShots", false);
|
||||
FAKE_PLAYER_KILL_PVP = FakePlayers.getBoolean("FakePlayerKillsRewardPvP", false);
|
||||
FAKE_PLAYER_KILL_KARMA = FakePlayers.getBoolean("FakePlayerUnflaggedKillsKarma", false);
|
||||
FAKE_PLAYER_AGGRO_MONSTERS = FakePlayers.getBoolean("FakePlayerAggroMonsters", false);
|
||||
FAKE_PLAYER_AGGRO_PLAYERS = FakePlayers.getBoolean("FakePlayerAggroPlayers", false);
|
||||
FAKE_PLAYER_AGGRO_FPC = FakePlayers.getBoolean("FakePlayerAggroFPC", false);
|
||||
FAKE_PLAYER_CAN_DROP_ITEMS = FakePlayers.getBoolean("FakePlayerCanDropItems", false);
|
||||
FAKE_PLAYER_CAN_PICKUP = FakePlayers.getBoolean("FakePlayerCanPickup", false);
|
||||
|
||||
// Load FindPvP config file (if exists)
|
||||
final PropertiesParser FindPvP = new PropertiesParser(CUSTOM_FIND_PVP_CONFIG_FILE);
|
||||
@@ -2920,7 +2920,7 @@ public class Config
|
||||
{
|
||||
try
|
||||
{
|
||||
PREMIUM_RATE_DROP_CHANCE_BY_ID.put(Integer.valueOf(itemSplit[0]), Float.valueOf(itemSplit[1]));
|
||||
PREMIUM_RATE_DROP_CHANCE_BY_ID.put(Integer.parseInt(itemSplit[0]), Float.parseFloat(itemSplit[1]));
|
||||
}
|
||||
catch (NumberFormatException nfe)
|
||||
{
|
||||
@@ -2947,7 +2947,7 @@ public class Config
|
||||
{
|
||||
try
|
||||
{
|
||||
PREMIUM_RATE_DROP_AMOUNT_BY_ID.put(Integer.valueOf(itemSplit[0]), Float.valueOf(itemSplit[1]));
|
||||
PREMIUM_RATE_DROP_AMOUNT_BY_ID.put(Integer.parseInt(itemSplit[0]), Float.parseFloat(itemSplit[1]));
|
||||
}
|
||||
catch (NumberFormatException nfe)
|
||||
{
|
||||
@@ -3020,7 +3020,7 @@ public class Config
|
||||
MOBS_LIST_NOT_RANDOM = new ArrayList<>(mobsIds.length);
|
||||
for (String id : mobsIds)
|
||||
{
|
||||
MOBS_LIST_NOT_RANDOM.add(Integer.valueOf(id));
|
||||
MOBS_LIST_NOT_RANDOM.add(Integer.parseInt(id));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
|
||||
*/
|
||||
public class NetworkManager
|
||||
{
|
||||
private final Logger LOGGER = Logger.getLogger(getClass().getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(NetworkManager.class.getName());
|
||||
|
||||
private final ServerBootstrap _serverBootstrap;
|
||||
private final String _host;
|
||||
|
||||
@@ -33,7 +33,7 @@ import org.l2jmobius.Config;
|
||||
*/
|
||||
public class DeadLockDetector extends Thread
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(DeadLockDetector.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(DeadLockDetector.class.getName());
|
||||
|
||||
private final Duration _checkInterval;
|
||||
private final Runnable _deadLockCallback;
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
|
||||
|
||||
public class ScrambledKeyPair
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(ScrambledKeyPair.class.getName());
|
||||
private final KeyPair _pair;
|
||||
private final byte[] _scrambledModulus;
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
|
||||
*/
|
||||
public class FortUpdater implements Runnable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(FortUpdater.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(FortUpdater.class.getName());
|
||||
private final Clan _clan;
|
||||
private final Fort _fort;
|
||||
private int _runCount;
|
||||
|
||||
@@ -1024,7 +1024,7 @@ public class SevenSignsFestival implements SpawnListener
|
||||
psInsert.setInt(1, festivalDat.getInt("festivalId"));
|
||||
psInsert.setString(2, festivalDat.getString("cabal"));
|
||||
psInsert.setInt(3, festivalDat.getInt("cycle"));
|
||||
psInsert.setLong(4, Long.valueOf(festivalDat.getString("date")));
|
||||
psInsert.setLong(4, Long.parseLong(festivalDat.getString("date")));
|
||||
psInsert.setInt(5, festivalDat.getInt("score"));
|
||||
psInsert.setString(6, festivalDat.getString("members"));
|
||||
psInsert.addBatch();
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.communitybbs.Manager.PostBBSManager;
|
||||
*/
|
||||
public class Post
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(Post.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(Post.class.getName());
|
||||
|
||||
public static class CPost
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
|
||||
public class ForumsBBSManager extends BaseBBSManager
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(ForumsBBSManager.class.getName());
|
||||
private final Collection<Forum> _table;
|
||||
private int _lastid = 1;
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
|
||||
*/
|
||||
public class AnnouncementsTable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(AnnouncementsTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(AnnouncementsTable.class.getName());
|
||||
|
||||
private final Map<Integer, IAnnouncement> _announcements = new ConcurrentSkipListMap<>();
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
*/
|
||||
public class CharNameTable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(CharNameTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(CharNameTable.class.getName());
|
||||
|
||||
private final Map<Integer, String> _chars = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, Integer> _accessLevels = new ConcurrentHashMap<>();
|
||||
|
||||
@@ -199,7 +199,7 @@ public class ClanTable
|
||||
player.setPledgeClass(ClanMember.calculatePledgeClass(player));
|
||||
player.setClanPrivileges(new EnumIntBitmask<>(ClanPrivilege.class, true));
|
||||
|
||||
_clans.put(Integer.valueOf(clan.getId()), clan);
|
||||
_clans.put(clan.getId(), clan);
|
||||
|
||||
// should be update packet only
|
||||
player.sendPacket(new PledgeShowInfoUpdate(clan));
|
||||
|
||||
@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.network.GameClient;
|
||||
|
||||
public class OfflineTradersTable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(OfflineTradersTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(OfflineTradersTable.class.getName());
|
||||
|
||||
// SQL DEFINITIONS
|
||||
private static final String SAVE_OFFLINE_STATUS = "INSERT INTO character_offline_trade (`charId`,`time`,`type`,`title`) VALUES (?,?,?,?)";
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.data.xml.impl.PetDataTable;
|
||||
|
||||
public class PetNameTable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(PetNameTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(PetNameTable.class.getName());
|
||||
|
||||
public static PetNameTable getInstance()
|
||||
{
|
||||
|
||||
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TeleportLocation;
|
||||
|
||||
public class TeleportLocationTable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(TeleportLocationTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(TeleportLocationTable.class.getName());
|
||||
|
||||
private final Map<Integer, TeleportLocation> _teleports = new HashMap<>();
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.holders.FakePlayerHolder;
|
||||
*/
|
||||
public class FakePlayerData implements IXmlReader
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(FakePlayerData.class.getName());
|
||||
|
||||
private final Map<Integer, FakePlayerHolder> _fakePlayerInfos = new HashMap<>();
|
||||
private final Map<String, String> _fakePlayerNames = new HashMap<>();
|
||||
|
||||
@@ -98,7 +98,7 @@ public class MultisellData implements IXmlReader
|
||||
try
|
||||
{
|
||||
|
||||
list.setUseRate(Double.valueOf(att.getNodeValue()));
|
||||
list.setUseRate(Double.parseDouble(att.getNodeValue()));
|
||||
if (list.getUseRate() <= 1e-6)
|
||||
{
|
||||
throw new NumberFormatException("The value cannot be 0"); // threat 0 as invalid value
|
||||
|
||||
@@ -77,7 +77,7 @@ public class PetDataTable implements IXmlReader
|
||||
{
|
||||
for (String foodId : attrs.getNamedItem("val").getNodeValue().split(";"))
|
||||
{
|
||||
data.addFood(Integer.valueOf(foodId));
|
||||
data.addFood(Integer.parseInt(foodId));
|
||||
}
|
||||
}
|
||||
else if ("load".equals(type))
|
||||
|
||||
@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
|
||||
*/
|
||||
public class PetSkillData implements IXmlReader
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(PetSkillData.class.getName());
|
||||
private final Map<Integer, Map<Long, SkillHolder>> _skillTrees = new HashMap<>();
|
||||
|
||||
protected PetSkillData()
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.skills.Skill;
|
||||
*/
|
||||
public class SkillData
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(SkillData.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(SkillData.class.getName());
|
||||
|
||||
private final Map<Integer, Skill> _skills = new ConcurrentHashMap<>();
|
||||
private final Map<Integer, Integer> _skillMaxLevel = new ConcurrentHashMap<>();
|
||||
|
||||
@@ -214,7 +214,7 @@ public class SkillTreesData implements IXmlReader
|
||||
}
|
||||
case "residenceId":
|
||||
{
|
||||
skillLearn.addResidenceId(Integer.valueOf(b.getTextContent()));
|
||||
skillLearn.addResidenceId(Integer.parseInt(b.getTextContent()));
|
||||
break;
|
||||
}
|
||||
case "socialClass":
|
||||
|
||||
@@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.util.GMAudit;
|
||||
*/
|
||||
public class ItemTable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(ItemTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(ItemTable.class.getName());
|
||||
private static Logger LOGGER_ITEMS = Logger.getLogger("item");
|
||||
|
||||
public static final Map<String, Integer> SLOTS = new HashMap<>();
|
||||
|
||||
@@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.model.entity.Castle;
|
||||
public class MerchantPriceConfigTable implements InstanceListManager
|
||||
{
|
||||
// Zoey76: TODO: Implement using IXmlReader.
|
||||
private static Logger LOGGER = Logger.getLogger(MerchantPriceConfigTable.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(MerchantPriceConfigTable.class.getName());
|
||||
|
||||
public static MerchantPriceConfigTable getInstance()
|
||||
{
|
||||
|
||||
@@ -80,7 +80,7 @@ public class SchemeBufferTable
|
||||
break;
|
||||
}
|
||||
|
||||
schemeList.add(Integer.valueOf(skill));
|
||||
schemeList.add(Integer.parseInt(skill));
|
||||
}
|
||||
|
||||
setScheme(objectId, schemeName, schemeList);
|
||||
|
||||
@@ -155,7 +155,7 @@ public class AntiFeedManager
|
||||
return false; // no such event registered
|
||||
}
|
||||
|
||||
final Integer addrHash = Integer.valueOf(client.getConnectionAddress().hashCode());
|
||||
final Integer addrHash = client.getConnectionAddress().hashCode();
|
||||
final AtomicInteger connectionCount = event.computeIfAbsent(addrHash, k -> new AtomicInteger());
|
||||
|
||||
if (!Config.DUALBOX_COUNT_OFFLINE_TRADERS)
|
||||
@@ -208,8 +208,7 @@ public class AntiFeedManager
|
||||
return false; // no such event registered
|
||||
}
|
||||
|
||||
final Integer addrHash = Integer.valueOf(client.getConnectionAddress().hashCode());
|
||||
|
||||
final Integer addrHash = client.getConnectionAddress().hashCode();
|
||||
return event.computeIfPresent(addrHash, (k, v) ->
|
||||
{
|
||||
if ((v == null) || (v.decrementAndGet() == 0))
|
||||
@@ -269,7 +268,7 @@ public class AntiFeedManager
|
||||
return max;
|
||||
}
|
||||
|
||||
final Integer addrHash = Integer.valueOf(client.getConnectionAddress().hashCode());
|
||||
final Integer addrHash = client.getConnectionAddress().hashCode();
|
||||
int limit = max;
|
||||
if (Config.DUALBOX_CHECK_WHITELIST.containsKey(addrHash))
|
||||
{
|
||||
|
||||
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
|
||||
*/
|
||||
public class DayNightSpawnManager
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(DayNightSpawnManager.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(DayNightSpawnManager.class.getName());
|
||||
|
||||
private final List<Spawn> _dayCreatures = new ArrayList<>();
|
||||
private final List<Spawn> _nightCreatures = new ArrayList<>();
|
||||
|
||||
@@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class DimensionalRiftManager
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(DimensionalRiftManager.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(DimensionalRiftManager.class.getName());
|
||||
private final Map<Byte, Map<Byte, DimensionalRiftRoom>> _rooms = new HashMap<>(7);
|
||||
private static final int DIMENSIONAL_FRAGMENT_ITEM_ID = 7079;
|
||||
|
||||
@@ -225,13 +225,13 @@ public class DimensionalRiftManager
|
||||
|
||||
public void reload()
|
||||
{
|
||||
for (Map<Byte, DimensionalRiftRoom> room : _rooms.values())
|
||||
for (Map<Byte, DimensionalRiftRoom> rooms : _rooms.values())
|
||||
{
|
||||
for (DimensionalRiftRoom drr : room.values())
|
||||
for (DimensionalRiftRoom room : rooms.values())
|
||||
{
|
||||
drr.getSpawns().clear();
|
||||
room.getSpawns().clear();
|
||||
}
|
||||
room.clear();
|
||||
rooms.clear();
|
||||
}
|
||||
_rooms.clear();
|
||||
loadRooms();
|
||||
@@ -244,7 +244,6 @@ public class DimensionalRiftManager
|
||||
{
|
||||
return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z);
|
||||
}
|
||||
|
||||
return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z) && !_rooms.get((byte) 0).get((byte) 0).checkIfInZone(x, y, z);
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
|
||||
*/
|
||||
public class FactionManager
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(FactionManager.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(FactionManager.class.getName());
|
||||
private final Map<Integer, Integer> _playerFactions = new ConcurrentHashMap<>();
|
||||
|
||||
protected FactionManager()
|
||||
|
||||
@@ -43,7 +43,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
|
||||
*/
|
||||
public class FakePlayerChatManager implements IXmlReader
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(FakePlayerChatManager.class.getName());
|
||||
final List<FakePlayerChatHolder> MESSAGES = new ArrayList<>();
|
||||
private static final int MIN_DELAY = 5000;
|
||||
private static final int MAX_DELAY = 15000;
|
||||
|
||||
@@ -56,7 +56,7 @@ public class GrandBossManager implements IStorable
|
||||
private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?";
|
||||
private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?";
|
||||
|
||||
protected static Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(GrandBossManager.class.getName());
|
||||
|
||||
protected static final Map<Integer, GrandBossInstance> BOSSES = new ConcurrentHashMap<>();
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.entity.Castle;
|
||||
|
||||
public class SiegeGuardManager
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(SiegeGuardManager.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(SiegeGuardManager.class.getName());
|
||||
|
||||
private final Castle _castle;
|
||||
private final List<Spawn> _siegeGuardSpawn = new ArrayList<>();
|
||||
|
||||
@@ -246,7 +246,7 @@ public class ArmorSet
|
||||
final Inventory inv = player.getInventory();
|
||||
|
||||
final ItemInstance shieldItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LHAND);
|
||||
return ((shieldItem != null) && _shield.contains(Integer.valueOf(shieldItem.getId())));
|
||||
return ((shieldItem != null) && _shield.contains(shieldItem.getId()));
|
||||
}
|
||||
|
||||
public boolean containShield(int shieldId)
|
||||
@@ -256,7 +256,7 @@ public class ArmorSet
|
||||
return false;
|
||||
}
|
||||
|
||||
return _shield.contains(Integer.valueOf(shieldId));
|
||||
return _shield.contains(shieldId);
|
||||
}
|
||||
|
||||
public List<SkillHolder> getShieldSkillId()
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||
|
||||
public class BlockList
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(BlockList.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(BlockList.class.getName());
|
||||
private static final Map<Integer, List<Integer>> OFFLINE_LIST = new ConcurrentHashMap<>();
|
||||
|
||||
private final PlayerInstance _owner;
|
||||
|
||||
@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
|
||||
|
||||
public class ShortCuts implements IRestorable
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(ShortCuts.class.getName());
|
||||
private static final int MAX_SHORTCUTS_PER_BAR = 12;
|
||||
private final PlayerInstance _owner;
|
||||
private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
|
||||
|
||||
@@ -28,7 +28,7 @@ import org.l2jmobius.commons.util.Rnd;
|
||||
*/
|
||||
public class Territory
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(Territory.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(Territory.class.getName());
|
||||
|
||||
protected static class Point
|
||||
{
|
||||
|
||||
@@ -67,7 +67,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class VillageMasterInstance extends NpcInstance
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(VillageMasterInstance.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(VillageMasterInstance.class.getName());
|
||||
|
||||
private static final Set<ClassId> mainSubclassSet;
|
||||
private static final Set<ClassId> neverSubclassed = EnumSet.of(ClassId.OVERLORD, ClassId.WARSMITH);
|
||||
|
||||
@@ -628,7 +628,7 @@ public class Instance
|
||||
}
|
||||
if (d.getAttributes().getNamedItem("allowRandomWalk") != null)
|
||||
{
|
||||
allowRandomWalk = Boolean.valueOf(d.getAttributes().getNamedItem("allowRandomWalk").getNodeValue());
|
||||
allowRandomWalk = Boolean.parseBoolean(d.getAttributes().getNamedItem("allowRandomWalk").getNodeValue());
|
||||
}
|
||||
|
||||
final StatsSet spawnSet = new StatsSet();
|
||||
|
||||
@@ -58,7 +58,7 @@ public class Hopzone extends VoteSystem
|
||||
{
|
||||
if (line.contains("<li><span class=\"rank anonymous tooltip\" title"))
|
||||
{
|
||||
return Integer.valueOf(line.split(">")[2].replace("</span", ""));
|
||||
return Integer.parseInt(line.split(">")[2].replace("</span", ""));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ public class Network extends VoteSystem
|
||||
{
|
||||
if (line.contains("<div class=\"tls-in-sts\"><b style"))
|
||||
{
|
||||
return Integer.valueOf(line.split(">")[2].replace("</b", ""));
|
||||
return Integer.parseInt(line.split(">")[2].replace("</b", ""));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public class Topzone extends VoteSystem
|
||||
String line;
|
||||
while ((line = br.readLine()) != null)
|
||||
{
|
||||
return Integer.valueOf(line);
|
||||
return Integer.parseInt(line);
|
||||
}
|
||||
|
||||
br.close();
|
||||
|
||||
@@ -594,7 +594,7 @@ public class EnterWorld implements IClientIncomingPacket
|
||||
|
||||
Calendar now = Calendar.getInstance();
|
||||
now.setTimeInMillis(System.currentTimeMillis());
|
||||
if ((NextBirthday == null) || (Integer.valueOf(NextBirthday) == now.get(Calendar.YEAR)))
|
||||
if ((NextBirthday == null) || (Integer.parseInt(NextBirthday) == now.get(Calendar.YEAR)))
|
||||
{
|
||||
player.sendPacket(SystemMessageId.HAPPY_BIRTHDAY_ALEGRIA_HAS_SENT_YOU_A_BIRTHDAY_GIFT);
|
||||
player.sendPacket(new ExBirthdayPopup());
|
||||
|
||||
@@ -31,7 +31,7 @@ import io.netty.channel.socket.nio.NioSocketChannel;
|
||||
*/
|
||||
public class LoginServerNetworkManager
|
||||
{
|
||||
private final Logger LOGGER = Logger.getLogger(getClass().getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(LoginServerNetworkManager.class.getName());
|
||||
|
||||
private final Bootstrap _bootstrap;
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket;
|
||||
*/
|
||||
public class BlowFishKey extends BaseSendablePacket
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(BlowFishKey.class.getName());
|
||||
|
||||
/**
|
||||
* @param blowfishKey
|
||||
|
||||
@@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
|
||||
|
||||
public class CharSelectionInfo implements IClientOutgoingPacket
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName());
|
||||
private final String _loginName;
|
||||
private final int _sessionId;
|
||||
private int _activeId;
|
||||
|
||||
@@ -238,14 +238,14 @@ public class TaskManager
|
||||
}
|
||||
case TYPE_SHEDULED:
|
||||
{
|
||||
delay = Long.valueOf(task.getParams()[0]);
|
||||
delay = Long.parseLong(task.getParams()[0]);
|
||||
task.scheduled = ThreadPool.schedule(task, delay);
|
||||
return true;
|
||||
}
|
||||
case TYPE_FIXED_SHEDULED:
|
||||
{
|
||||
delay = Long.valueOf(task.getParams()[0]);
|
||||
interval = Long.valueOf(task.getParams()[1]);
|
||||
delay = Long.parseLong(task.getParams()[0]);
|
||||
interval = Long.parseLong(task.getParams()[1]);
|
||||
task.scheduled = ThreadPool.scheduleAtFixedRate(task, delay, interval);
|
||||
return true;
|
||||
}
|
||||
@@ -280,7 +280,7 @@ public class TaskManager
|
||||
}
|
||||
case TYPE_GLOBAL_TASK:
|
||||
{
|
||||
interval = Long.valueOf(task.getParams()[0]) * 86400000;
|
||||
interval = Long.parseLong(task.getParams()[0]) * 86400000;
|
||||
final String[] hour = task.getParams()[1].split(":");
|
||||
|
||||
if (hour.length != 3)
|
||||
|
||||
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.RelationChanged;
|
||||
*/
|
||||
public class Broadcast
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(Broadcast.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(Broadcast.class.getName());
|
||||
|
||||
/**
|
||||
* Send a packet to all PlayerInstance in the _KnownPlayers of the Creature that have the Character targeted.<BR>
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.Config;
|
||||
*/
|
||||
public abstract class FloodProtectedListener extends Thread
|
||||
{
|
||||
private final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(FloodProtectedListener.class.getName());
|
||||
private final Map<String, ForeignConnection> _floodProtection = new ConcurrentHashMap<>();
|
||||
private ServerSocket _serverSocket;
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ import org.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail;
|
||||
*/
|
||||
public class GameServerPacketHandler
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(GameServerPacketHandler.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(GameServerPacketHandler.class.getName());
|
||||
|
||||
public enum GameServerState
|
||||
{
|
||||
|
||||
@@ -46,7 +46,7 @@ import org.l2jmobius.loginserver.network.serverpackets.ServerList;
|
||||
*/
|
||||
public class RequestAuthLogin implements IIncomingPacket<LoginClient>
|
||||
{
|
||||
private static Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName());
|
||||
private static final Logger LOGGER = Logger.getLogger(RequestAuthLogin.class.getName());
|
||||
|
||||
private final byte[] _raw1 = new byte[128];
|
||||
private final byte[] _raw2 = new byte[128];
|
||||
|
||||
@@ -27,7 +27,7 @@ import org.l2jmobius.loginserver.LoginController;
|
||||
*/
|
||||
public class ChangeAccessLevel extends BaseRecievePacket
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(ChangeAccessLevel.class.getName());
|
||||
|
||||
/**
|
||||
* @param decrypt
|
||||
|
||||
@@ -36,7 +36,7 @@ import org.l2jmobius.loginserver.GameServerThread;
|
||||
*/
|
||||
public class ChangePassword extends BaseRecievePacket
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(ChangePassword.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(ChangePassword.class.getName());
|
||||
private static GameServerThread gst = null;
|
||||
|
||||
public ChangePassword(byte[] decrypt)
|
||||
|
||||
@@ -45,7 +45,7 @@ import org.l2jmobius.loginserver.network.loginserverpackets.LoginServerFail;
|
||||
*/
|
||||
public class GameServerAuth extends BaseRecievePacket
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(GameServerAuth.class.getName());
|
||||
GameServerThread _server;
|
||||
private final byte[] _hexId;
|
||||
private final int _desiredId;
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.l2jmobius.loginserver.GameServerThread;
|
||||
*/
|
||||
public class PlayerLogout extends BaseRecievePacket
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(PlayerLogout.class.getName());
|
||||
|
||||
/**
|
||||
* @param decrypt
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.l2jmobius.loginserver.LoginController;
|
||||
*/
|
||||
public class PlayerTracert extends BaseRecievePacket
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(PlayerTracert.class.getName());
|
||||
|
||||
/**
|
||||
* @param decrypt
|
||||
|
||||
@@ -28,7 +28,7 @@ import org.l2jmobius.loginserver.GameServerThread;
|
||||
*/
|
||||
public class ServerStatus extends BaseRecievePacket
|
||||
{
|
||||
protected static Logger LOGGER = Logger.getLogger(ServerStatus.class.getName());
|
||||
protected static final Logger LOGGER = Logger.getLogger(ServerStatus.class.getName());
|
||||
|
||||
public static final int SERVER_LIST_STATUS = 0x01;
|
||||
public static final int SERVER_TYPE = 0x02;
|
||||
|
||||
Reference in New Issue
Block a user