cleanup: use Integer#parseInt where applicable

This commit is contained in:
P0nk
2021-04-08 07:40:42 +02:00
parent 7ff8190977
commit 8aa44711e3
8 changed files with 19 additions and 25 deletions

View File

@@ -44,7 +44,7 @@ public class JailCommand extends Command {
int minutesJailed = 5; int minutesJailed = 5;
if (params.length >= 2) { if (params.length >= 2) {
minutesJailed = Integer.valueOf(params[1]); minutesJailed = Integer.parseInt(params[1]);
if (minutesJailed <= 0) { if (minutesJailed <= 0) {
player.yellowMessage("Syntax: !jail <playername> [<minutes>]"); player.yellowMessage("Syntax: !jail <playername> [<minutes>]");
return; return;

View File

@@ -40,9 +40,9 @@ public class HpMpCommand extends Command {
if (params.length == 2) { if (params.length == 2) {
victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
statUpdate = Integer.valueOf(params[1]); statUpdate = Integer.parseInt(params[1]);
} else if (params.length == 1) { } else if (params.length == 1) {
statUpdate = Integer.valueOf(params[0]); statUpdate = Integer.parseInt(params[0]);
} else { } else {
player.yellowMessage("Syntax: !hpmp [<playername>] <value>"); player.yellowMessage("Syntax: !hpmp [<playername>] <value>");
} }

View File

@@ -40,9 +40,9 @@ public class MaxHpMpCommand extends Command {
int statUpdate = 1; int statUpdate = 1;
if (params.length >= 2) { if (params.length >= 2) {
victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]); victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
statUpdate = Integer.valueOf(params[1]); statUpdate = Integer.parseInt(params[1]);
} else if (params.length == 1) { } else if (params.length == 1) {
statUpdate = Integer.valueOf(params[0]); statUpdate = Integer.parseInt(params[0]);
} else { } else {
player.yellowMessage("Syntax: !maxhpmp [<playername>] <value>"); player.yellowMessage("Syntax: !maxhpmp [<playername>] <value>");
} }

View File

@@ -22,20 +22,6 @@ package net.server.coordinator.partysearch;
import client.MapleCharacter; import client.MapleCharacter;
import client.MapleJob; import client.MapleJob;
import config.YamlConfig; import config.YamlConfig;
import java.io.File;
import net.server.world.MapleParty;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import tools.MaplePacketCreator;
import tools.Pair;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import net.server.audit.locks.MonitoredLockType; import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock; import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock; import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -43,9 +29,17 @@ import net.server.audit.locks.MonitoredWriteLock;
import net.server.audit.locks.factory.MonitoredReadLockFactory; import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import net.server.coordinator.world.MapleInviteCoordinator; import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.world.MapleParty;
import provider.MapleData; import provider.MapleData;
import provider.MapleDataProviderFactory; import provider.MapleDataProviderFactory;
import provider.MapleDataTool; import provider.MapleDataTool;
import tools.MaplePacketCreator;
import tools.Pair;
import java.io.File;
import java.util.*;
import java.util.Map.Entry;
/** /**
* *
@@ -77,7 +71,7 @@ public class MaplePartySearchCoordinator {
MapleData data = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "Etc.wz")).getData("MapNeighbors.img"); MapleData data = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "Etc.wz")).getData("MapNeighbors.img");
if (data != null) { if (data != null) {
for (MapleData mapdata : data.getChildren()) { for (MapleData mapdata : data.getChildren()) {
int mapid = Integer.valueOf(mapdata.getName()); int mapid = Integer.parseInt(mapdata.getName());
Set<Integer> neighborMaps = new HashSet<>(); Set<Integer> neighborMaps = new HashSet<>();
mapLinks.put(mapid, neighborMaps); mapLinks.put(mapid, neighborMaps);

View File

@@ -425,7 +425,7 @@ public class AbstractPlayerInteraction {
public int getQuestProgressInt(int id) { public int getQuestProgressInt(int id) {
try { try {
return Integer.valueOf(getQuestProgress(id)); return Integer.parseInt(getQuestProgress(id));
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
return 0; return 0;
} }
@@ -433,7 +433,7 @@ public class AbstractPlayerInteraction {
public int getQuestProgressInt(int id, int infoNumber) { public int getQuestProgressInt(int id, int infoNumber) {
try { try {
return Integer.valueOf(getQuestProgress(id, infoNumber)); return Integer.parseInt(getQuestProgress(id, infoNumber));
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
return 0; return 0;
} }

View File

@@ -281,7 +281,7 @@ public class MapleLifeFactory {
private static void decodeElementalString(MapleMonsterStats stats, String elemAttr) { private static void decodeElementalString(MapleMonsterStats stats, String elemAttr) {
for (int i = 0; i < elemAttr.length(); i += 2) { for (int i = 0; i < elemAttr.length(); i += 2) {
stats.setEffectiveness(Element.getFromChar(elemAttr.charAt(i)), ElementalEffectiveness.getByNumber(Integer.valueOf(String.valueOf(elemAttr.charAt(i + 1))))); stats.setEffectiveness(Element.getFromChar(elemAttr.charAt(i)), ElementalEffectiveness.getByNumber(Integer.parseInt(String.valueOf(elemAttr.charAt(i + 1)))));
} }
} }

View File

@@ -40,7 +40,7 @@ public class BuffExceptRequirement extends MapleQuestRequirement {
@Override @Override
public void processData(MapleData data) { public void processData(MapleData data) {
// item buffs are negative // item buffs are negative
buffId = -1 * Integer.valueOf(MapleDataTool.getString(data)); buffId = -1 * Integer.parseInt(MapleDataTool.getString(data));
} }
@Override @Override

View File

@@ -40,7 +40,7 @@ public class BuffRequirement extends MapleQuestRequirement {
@Override @Override
public void processData(MapleData data) { public void processData(MapleData data) {
// item buffs are negative // item buffs are negative
buffId = -1 * Integer.valueOf(MapleDataTool.getString(data)); buffId = -1 * Integer.parseInt(MapleDataTool.getString(data));
} }
@Override @Override