Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: remove unnecessary boxing

Browse Source
This commit is contained in:
P0nk
2021-04-08 07:39:02 +02:00
parent 5c6f515d18
commit 7ff8190977
14 changed files with 150 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/server/maps/MapleMap.java
View File

@@ -465,7 +465,7 @@ public class MapleMap {
public void removeMapObject(int num) {
objectWLock.lock();
try {
this.mapobjects.remove(Integer.valueOf(num));
this.mapobjects.remove(num);
} finally {
objectWLock.unlock();
}
@@ -611,7 +611,7 @@ public class MapleMap {
}
distn = Math.sqrt(distn);
return new Pair<>(getRoundedCoordinate(angle), Integer.valueOf((int)distn));
return new Pair<>(getRoundedCoordinate(angle), (int) distn);
}
private static void sortDropEntries(List<MonsterDropEntry> from, List<MonsterDropEntry> item, List<MonsterDropEntry> visibleQuest, List<MonsterDropEntry> otherQuest, MapleCharacter chr) {
@@ -1730,7 +1730,7 @@ public class MapleMap {
broadcastMessage(MaplePacketCreator.removeNPCController(obj.getObjectId()));
broadcastMessage(MaplePacketCreator.removeNPC(obj.getObjectId()));
this.mapobjects.remove(Integer.valueOf(obj.getObjectId()));
this.mapobjects.remove(obj.getObjectId());
}
}
} finally {
@@ -2520,7 +2520,7 @@ public class MapleMap {
}
objectWLock.lock();
try {
this.mapobjects.put(Integer.valueOf(chr.getObjectId()), chr);
this.mapobjects.put(chr.getObjectId(), chr);
} finally {
objectWLock.unlock();
}

20
src/main/java/server/maps/MapleReactorFactory.java
View File

@@ -41,14 +41,14 @@ public class MapleReactorFactory {
public static final MapleReactorStats getReactorS(int rid) {
MapleReactorStats stats = reactorStats.get(Integer.valueOf(rid));
MapleReactorStats stats = reactorStats.get(rid);
if (stats == null) {
int infoId = rid;
MapleData reactorData = data.getData(StringUtil.getLeftPaddedStr(infoId + ".img", '0', 11));
MapleData link = reactorData.getChildByPath("info/link");
if (link != null) {
infoId = MapleDataTool.getIntConvert("info/link", reactorData);
stats = reactorStats.get(Integer.valueOf(infoId));
stats = reactorStats.get(infoId);
}
if (stats == null) {
stats = new MapleReactorStats();
@@ -83,26 +83,26 @@ public class MapleReactorFactory {
stats.addState(i, 999, null, (byte) (foundState ? -1 : (i + 1)), 0, (byte) 0);
}
}
reactorStats.put(Integer.valueOf(infoId), stats);
reactorStats.put(infoId, stats);
if (rid != infoId) {
reactorStats.put(Integer.valueOf(rid), stats);
reactorStats.put(rid, stats);
}
} else { // stats exist at infoId but not rid; add to map
reactorStats.put(Integer.valueOf(rid), stats);
reactorStats.put(rid, stats);
}
}
return stats;
}
public static MapleReactorStats getReactor(int rid) {
MapleReactorStats stats = reactorStats.get(Integer.valueOf(rid));
MapleReactorStats stats = reactorStats.get(rid);
if (stats == null) {
int infoId = rid;
MapleData reactorData = data.getData(StringUtil.getLeftPaddedStr(infoId + ".img", '0', 11));
MapleData link = reactorData.getChildByPath("info/link");
if (link != null) {
infoId = MapleDataTool.getIntConvert("info/link", reactorData);
stats = reactorStats.get(Integer.valueOf(infoId));
stats = reactorStats.get(infoId);
}
MapleData activateOnTouch = reactorData.getChildByPath("info/activateByTouch");
boolean loadArea = false;
@@ -159,13 +159,13 @@ public class MapleReactorFactory {
statedatas.add(new StateData(999, null, null, (byte) 0));
stats.addState((byte) 0, statedatas, -1);
}
reactorStats.put(Integer.valueOf(infoId), stats);
reactorStats.put(infoId, stats);
if (rid != infoId) {
reactorStats.put(Integer.valueOf(rid), stats);
reactorStats.put(rid, stats);
}
} else // stats exist at infoId but not rid; add to map
{
reactorStats.put(Integer.valueOf(rid), stats);
reactorStats.put(rid, stats);
}
}
return stats;