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

6
src/main/java/server/life/MapleLifeFactory.java
View File

@@ -240,13 +240,13 @@ public class MapleLifeFactory {
public static MapleMonster getMonster(int mid) {
try {
MapleMonsterStats stats = monsterStats.get(Integer.valueOf(mid));
MapleMonsterStats stats = monsterStats.get(mid);
if (stats == null) {
Pair<MapleMonsterStats, List<MobAttackInfoHolder>> mobStats = getMonsterStats(mid);
stats = mobStats.getLeft();
setMonsterAttackInfo(mid, mobStats.getRight());
monsterStats.put(Integer.valueOf(mid), stats);
monsterStats.put(mid, stats);
}
MapleMonster ret = new MapleMonster(mid, stats);
return ret;
@@ -260,7 +260,7 @@ public class MapleLifeFactory {
public static int getMonsterLevel(int mid) {
try {
MapleMonsterStats stats = monsterStats.get(Integer.valueOf(mid));
MapleMonsterStats stats = monsterStats.get(mid);
if (stats == null) {
MapleData monsterData = data.getData(StringUtil.getLeftPaddedStr(mid + ".img", '0', 11));
if (monsterData == null) {

8
src/main/java/server/life/MapleMonster.java
View File

@@ -1195,7 +1195,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
if (poison) {
int poisonLevel = from.getSkillLevel(status.getSkill());
int poisonDamage = Math.min(Short.MAX_VALUE, (int) (getMaxHp() / (70.0 - poisonLevel) + 0.999));
status.setValue(MonsterStatus.POISON, Integer.valueOf(poisonDamage));
status.setValue(MonsterStatus.POISON, poisonDamage);
animationTime = broadcastStatusEffect(status);
overtimeAction = new DamageTask(poisonDamage, from, status, 0);
@@ -1221,8 +1221,8 @@ public class MapleMonster extends AbstractLoadedMapleLife {
poisonDamage += (Randomizer.nextInt(gap) + minDmg);
}
poisonDamage = Math.min(Short.MAX_VALUE, poisonDamage);
status.setValue(MonsterStatus.VENOMOUS_WEAPON, Integer.valueOf(poisonDamage));
status.setValue(MonsterStatus.POISON, Integer.valueOf(poisonDamage));
status.setValue(MonsterStatus.VENOMOUS_WEAPON, poisonDamage);
status.setValue(MonsterStatus.POISON, poisonDamage);
animationTime = broadcastStatusEffect(status);
overtimeAction = new DamageTask(poisonDamage, from, status, 0);
@@ -1244,7 +1244,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
final byte level = from.getSkillLevel(skill);
final int damage = (int) ((from.getStr() + from.getLuk()) * ((3.7 * skill.getEffect(level).getDamage()) / 100));
status.setValue(MonsterStatus.NINJA_AMBUSH, Integer.valueOf(damage));
status.setValue(MonsterStatus.NINJA_AMBUSH, damage);
animationTime = broadcastStatusEffect(status);
overtimeAction = new DamageTask(damage, from, status, 2);

18
src/main/java/server/life/MobSkill.java
View File

@@ -123,22 +123,22 @@ public class MobSkill {
case 100:
case 110:
case 150:
stats.put(MonsterStatus.WEAPON_ATTACK_UP, Integer.valueOf(x));
stats.put(MonsterStatus.WEAPON_ATTACK_UP, x);
break;
case 101:
case 111:
case 151:
stats.put(MonsterStatus.MAGIC_ATTACK_UP, Integer.valueOf(x));
stats.put(MonsterStatus.MAGIC_ATTACK_UP, x);
break;
case 102:
case 112:
case 152:
stats.put(MonsterStatus.WEAPON_DEFENSE_UP, Integer.valueOf(x));
stats.put(MonsterStatus.WEAPON_DEFENSE_UP, x);
break;
case 103:
case 113:
case 153:
stats.put(MonsterStatus.MAGIC_DEFENSE_UP, Integer.valueOf(x));
stats.put(MonsterStatus.MAGIC_DEFENSE_UP, x);
break;
case 114:
if (lt != null && rb != null && skill) {
@@ -204,12 +204,12 @@ public class MobSkill {
break;
case 140:
if (makeChanceResult() && !monster.isBuffed(MonsterStatus.MAGIC_IMMUNITY)) {
stats.put(MonsterStatus.WEAPON_IMMUNITY, Integer.valueOf(x));
stats.put(MonsterStatus.WEAPON_IMMUNITY, x);
}
break;
case 141:
if (makeChanceResult() && !monster.isBuffed(MonsterStatus.WEAPON_IMMUNITY)) {
stats.put(MonsterStatus.MAGIC_IMMUNITY, Integer.valueOf(x));
stats.put(MonsterStatus.MAGIC_IMMUNITY, x);
}
break;
case 143: // Weapon Reflect
@@ -230,13 +230,13 @@ public class MobSkill {
reflection.add(x);
break;
case 154:
stats.put(MonsterStatus.ACC, Integer.valueOf(x));
stats.put(MonsterStatus.ACC, x);
break;
case 155:
stats.put(MonsterStatus.AVOID, Integer.valueOf(x));
stats.put(MonsterStatus.AVOID, x);
break;
case 156:
stats.put(MonsterStatus.SPEED, Integer.valueOf(x));
stats.put(MonsterStatus.SPEED, x);
break;
case 200: // summon
int skillLimit = this.getLimit();

15
src/main/java/server/life/MobSkillFactory.java
View File

@@ -21,12 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package server.life;
import java.awt.Point;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -38,6 +32,13 @@ import provider.MapleDataProvider;
import provider.MapleDataProviderFactory;
import provider.MapleDataTool;
import java.awt.*;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
* @author Danny (Leifde)
@@ -75,7 +76,7 @@ public class MobSkillFactory {
if (skillData.getChildByPath(String.valueOf(i)) == null) {
break;
}
toSummon.add(Integer.valueOf(MapleDataTool.getInt(skillData.getChildByPath(String.valueOf(i)), 0)));
toSummon.add(MapleDataTool.getInt(skillData.getChildByPath(String.valueOf(i)), 0));
}
int effect = MapleDataTool.getInt("summonEffect", skillData, 0);
int hp = MapleDataTool.getInt("hp", skillData, 100);