lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent various auto-boxing operations by using primitive getters.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-06-27 23:45:29 +00:00
parent 5dc0351dbc
commit 7ee1d55060
343 changed files with 757 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -333,7 +333,7 @@ public class AwakeningMaster extends AbstractNpcAI
{
if (player.isInCategory(ent.getKey()))
{
giveItems(player, ent.getValue(), 1);
giveItems(player, ent.getValue().intValue(), 1);
break;
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -217,7 +217,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -100,7 +100,7 @@ public class AirBind extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5));

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
@@ -63,7 +63,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
}

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{
@@ -70,9 +70,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java vendored
View File

@@ -80,7 +80,7 @@ public class DispelBySlot extends AbstractEffect
{
// Dispel transformations (buff and by GM)
final Short transformToDispel = _dispelAbnormals.get(AbnormalType.TRANSFORM);
if ((transformToDispel != null) && ((transformToDispel == effected.getTransformationId()) || (transformToDispel < 0)))
if ((transformToDispel != null) && ((transformToDispel.intValue() == effected.getTransformationId()) || (transformToDispel.intValue() < 0)))
{
effected.stopTransformation(true);
}
@@ -94,7 +94,7 @@ public class DispelBySlot extends AbstractEffect
}
final Short abnormalLevel = _dispelAbnormals.get(info.getSkill().getAbnormalType());
return (abnormalLevel != null) && ((abnormalLevel < 0) || (abnormalLevel >= info.getSkill().getAbnormalLvl()));
return (abnormalLevel != null) && ((abnormalLevel.shortValue() < 0) || (abnormalLevel.shortValue() >= info.getSkill().getAbnormalLvl()));
}, true, true);
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -179,7 +179,7 @@ public class KnockBack extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 3));

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@@ -141,7 +141,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect
// Skill specific mods.
final double weaponMod = effector.getAttackType().isRanged() ? 70 : 77;
final double weaponBonus = _weaponBonus.getOrDefault(effector.getAttackType(), 1.0);
final double weaponBonus = _weaponBonus.containsKey(effector.getAttackType()) ? _weaponBonus.get(effector.getAttackType()).doubleValue() : 1d;
final double power = _power + effector.getStat().getValue(Stat.SKILL_POWER_ADD, 0);
final double rangedBonus = effector.getAttackType().isRanged() ? attack + power : 0;
final double critMod = critical ? Formulas.calcCritDamage(effector, effected, skill) : 1;

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -117,7 +117,7 @@ public class RestorationRandom extends AbstractEffect
newItem.setEnchantLevel(Rnd.get(createdItem.getMinEnchant(), createdItem.getMaxEnchant()));
}
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + itemCount);
}
@@ -143,7 +143,7 @@ public class RestorationRandom extends AbstractEffect
playerIU.addModifiedItem(itemInstance);
}
}
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
player.sendPacket(playerIU);
}
@@ -155,7 +155,7 @@ public class RestorationRandom extends AbstractEffect
return EffectType.EXTRACT_ITEM;
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java vendored
View File

@@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect
{
for (Entry<Stat, Float> stats : _sharedStats.entrySet())
{
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue());
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue().floatValue());
}
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java vendored
View File

@@ -63,7 +63,7 @@ public class Transformation extends AbstractEffect
{
if (!_id.isEmpty())
{
effected.transform(_id.get(Rnd.get(_id.size())), true);
effected.transform(_id.get(Rnd.get(_id.size())).intValue(), true);
}
}

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler
for (Entry<ItemInstance, Long> entry : extractedItems.entrySet())
{
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
return true;
@@ -208,7 +208,7 @@ public class ExtractableItems implements IItemHandler
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem)
{
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + 1);
}
@@ -218,7 +218,7 @@ public class ExtractableItems implements IItemHandler
}
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

11
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java vendored
View File

@@ -260,10 +260,13 @@ public class EvilIncubator extends AbstractInstance
if (st.isCond(9))
{
st.setCond(10, true);
final int classItemId = CLASS_ITEMS.getOrDefault(player.getClassId(), -1);
if ((classItemId != -1) && !hasQuestItems(player, classItemId))
if (CLASS_ITEMS.containsKey(player.getClassId()))
{
giveItems(player, classItemId, 1);
final int classItemId = CLASS_ITEMS.get(player.getClassId()).intValue();
if (!hasQuestItems(player, classItemId))
{
giveItems(player, classItemId, 1);
}
}
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_CRY_OF_DESTINY_PENDANT_WILL_BE_HELPFUL_TO_YOU_PLEASE_EQUIP_IT_AND_BRING_OUT_THE_POWER_OF_THE_PENDANT_TO_PREPARE_FOR_THE_NEXT_FIGHT);
htmltext = "33170-06.html";
@@ -494,7 +497,7 @@ public class EvilIncubator extends AbstractInstance
world.setParameter("WORLD_WAVE", waveId);
showOnScreenMsg(world, NpcStringId.I_DEATH_WOUND_CHAMPION_OF_SHILEN_SHALL_END_YOUR_WORLD, ExShowScreenMessage.TOP_CENTER, 5000, true);
getTimers().addTimer("SPAWN_WAVE", 20000, e -> manageWaveSpawn(world));
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()), BOSS_LOC, false, 0, false, world.getId());
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()).intValue(), BOSS_LOC, false, 0, false, world.getId());
world.broadcastPacket(new Earthquake(boss, 50, 10));
break;
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance
for (Entry<Integer, Long> entry : instanceTimes.entrySet())
{
// find instance with same name (kamaloka or labyrinth)
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey())))
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey().intValue())))
{
continue;
}
// if found instance still can't be reentered - exit
if (System.currentTimeMillis() < entry.getValue())
if (System.currentTimeMillis() < entry.getValue().longValue())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java vendored
View File

@@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI
for (Entry<WorldObject, Integer> entry : sortedHpMap.entrySet())
{
final WorldObject friend = entry.getKey();
final int percent = entry.getValue();
final int percent = entry.getValue().intValue();
if ((friend != null) && (percent < 80) && (percent > 1))
{
peopleToHeal.add(friend);

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java vendored
View File

@@ -85,7 +85,7 @@ public abstract class ThirdClassTransferQuest extends Quest
addTalkId(VANGUARDS);
for (Entry<Race, Integer> tag : RACE_TAGS.entrySet())
{
registerQuestItems(tag.getValue());
registerQuestItems(tag.getValue().intValue());
}
//@formatter:off
registerQuestItems(
@@ -157,7 +157,7 @@ public abstract class ThirdClassTransferQuest extends Quest
{
qs.setCond(4, true);
qs.unset("vanguard");
takeItems(player, RACE_TAGS.get(player.getRace()), -1);
takeItems(player, RACE_TAGS.get(player.getRace()).intValue(), -1);
htmltext = event;
}
break;
@@ -179,9 +179,9 @@ public abstract class ThirdClassTransferQuest extends Quest
final int vanguard = qs.getInt("vanguard");
if ((vanguard & bit) != bit)
{
giveItems(player, RACE_TAGS.get(player.getRace()), 1);
giveItems(player, RACE_TAGS.get(player.getRace()).intValue(), 1);
qs.set("vanguard", vanguard | bit);
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace())) == 4)
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace()).intValue()) == 4)
{
qs.setCond(3, true);
htmltext = "vanguard-04.html";

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java
View File

@@ -70,6 +70,6 @@ public enum StatusUpdateType
public int getValue(Creature creature)
{
return _valueSupplier.apply(creature);
return _valueSupplier.apply(creature).intValue();
}
}

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java
View File

@@ -60,7 +60,8 @@ public class EnchantSkillHolder
public long getSp(SkillEnchantType type)
{
return _sp.getOrDefault(type, 0L);
final Long val = _sp.get(type);
return val != null ? val.longValue() : 0;
}
public void addChance(SkillEnchantType type, int chance)
@@ -70,7 +71,8 @@ public class EnchantSkillHolder
public int getChance(SkillEnchantType type)
{
return _chance.getOrDefault(type, 100);
final Integer val = _chance.get(type);
return val != null ? val.intValue() : 100;
}
public void addRequiredItem(SkillEnchantType type, ItemHolder item)

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java
View File

@@ -65,7 +65,7 @@ public class EnchantRateItem
*/
public void setMagicWeapon(boolean magicWeapon)
{
_isMagicWeapon = magicWeapon;
_isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE;
}
/**
@@ -82,7 +82,7 @@ public class EnchantRateItem
{
return false;
}
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon))
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue()))
{
return false;
}

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@@ -51,7 +51,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : NORMAL_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingNormal = false;
@@ -67,7 +67,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : ATTACK_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingAttack = false;

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
View File

@@ -47,7 +47,7 @@ public class DecayTaskManager
final long time = System.currentTimeMillis();
for (Entry<Creature, Long> entry : DECAY_SCHEDULES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Creature creature = entry.getKey();
DECAY_SCHEDULES.remove(creature);
@@ -107,7 +107,7 @@ public class DecayTaskManager
public long getRemainingTime(Creature creature)
{
final Long time = DECAY_SCHEDULES.get(creature);
return time != null ? time - System.currentTimeMillis() : Long.MAX_VALUE;
return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE;
}
@Override
@@ -130,7 +130,7 @@ public class DecayTaskManager
ret.append('/');
ret.append(entry.getKey().getName());
ret.append(" decay timer: ");
ret.append(entry.getValue() - time);
ret.append(entry.getValue().longValue() - time);
ret.append(Config.EOL);
}

8
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java
View File

@@ -46,15 +46,15 @@ public class MessageDeletionTaskManager
}
_working = true;
int msgId;
Integer msgId;
Message msg;
final long time = System.currentTimeMillis();
for (Entry<Integer, Long> entry : PENDING_MESSAGES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
msgId = entry.getKey();
msg = MailManager.getInstance().getMessage(msgId);
msg = MailManager.getInstance().getMessage(msgId.intValue());
if (msg == null)
{
PENDING_MESSAGES.remove(msgId);
@@ -83,7 +83,7 @@ public class MessageDeletionTaskManager
}
}
MailManager.getInstance().deleteMessageInDb(msgId);
MailManager.getInstance().deleteMessageInDb(msgId.intValue());
PENDING_MESSAGES.remove(msgId);
}
}

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java
View File

@@ -46,7 +46,7 @@ public class RandomAnimationTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_ANIMATIONS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
if (npc.isInActiveRegion() && !npc.isDead() && !npc.isInCombat() && !npc.isMoving() && !npc.hasBlockActions())

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@@ -45,7 +45,7 @@ public class RespawnTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -333,7 +333,7 @@ public class AwakeningMaster extends AbstractNpcAI
{
if (player.isInCategory(ent.getKey()))
{
giveItems(player, ent.getValue(), 1);
giveItems(player, ent.getValue().intValue(), 1);
break;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -217,7 +217,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -100,7 +100,7 @@ public class AirBind extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5));

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
@@ -63,7 +63,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
}

8
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{
@@ -70,9 +70,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java vendored
View File

@@ -80,7 +80,7 @@ public class DispelBySlot extends AbstractEffect
{
// Dispel transformations (buff and by GM)
final Short transformToDispel = _dispelAbnormals.get(AbnormalType.TRANSFORM);
if ((transformToDispel != null) && ((transformToDispel == effected.getTransformationId()) || (transformToDispel < 0)))
if ((transformToDispel != null) && ((transformToDispel.intValue() == effected.getTransformationId()) || (transformToDispel.intValue() < 0)))
{
effected.stopTransformation(true);
}
@@ -94,7 +94,7 @@ public class DispelBySlot extends AbstractEffect
}
final Short abnormalLevel = _dispelAbnormals.get(info.getSkill().getAbnormalType());
return (abnormalLevel != null) && ((abnormalLevel < 0) || (abnormalLevel >= info.getSkill().getAbnormalLvl()));
return (abnormalLevel != null) && ((abnormalLevel.shortValue() < 0) || (abnormalLevel.shortValue() >= info.getSkill().getAbnormalLvl()));
}, true, true);
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -179,7 +179,7 @@ public class KnockBack extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 3));

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@@ -141,7 +141,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect
// Skill specific mods.
final double weaponMod = effector.getAttackType().isRanged() ? 70 : 77;
final double weaponBonus = _weaponBonus.getOrDefault(effector.getAttackType(), 1.0);
final double weaponBonus = _weaponBonus.containsKey(effector.getAttackType()) ? _weaponBonus.get(effector.getAttackType()).doubleValue() : 1d;
final double power = _power + effector.getStat().getValue(Stat.SKILL_POWER_ADD, 0);
final double rangedBonus = effector.getAttackType().isRanged() ? attack + power : 0;
final double critMod = critical ? Formulas.calcCritDamage(effector, effected, skill) : 1;

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -117,7 +117,7 @@ public class RestorationRandom extends AbstractEffect
newItem.setEnchantLevel(Rnd.get(createdItem.getMinEnchant(), createdItem.getMaxEnchant()));
}
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + itemCount);
}
@@ -143,7 +143,7 @@ public class RestorationRandom extends AbstractEffect
playerIU.addModifiedItem(itemInstance);
}
}
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
player.sendPacket(playerIU);
}
@@ -155,7 +155,7 @@ public class RestorationRandom extends AbstractEffect
return EffectType.EXTRACT_ITEM;
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java vendored
View File

@@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect
{
for (Entry<Stat, Float> stats : _sharedStats.entrySet())
{
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue());
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue().floatValue());
}
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java vendored
View File

@@ -63,7 +63,7 @@ public class Transformation extends AbstractEffect
{
if (!_id.isEmpty())
{
effected.transform(_id.get(Rnd.get(_id.size())), true);
effected.transform(_id.get(Rnd.get(_id.size())).intValue(), true);
}
}

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler
for (Entry<ItemInstance, Long> entry : extractedItems.entrySet())
{
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
return true;
@@ -208,7 +208,7 @@ public class ExtractableItems implements IItemHandler
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem)
{
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + 1);
}
@@ -218,7 +218,7 @@ public class ExtractableItems implements IItemHandler
}
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

11
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java vendored
View File

@@ -260,10 +260,13 @@ public class EvilIncubator extends AbstractInstance
if (st.isCond(9))
{
st.setCond(10, true);
final int classItemId = CLASS_ITEMS.getOrDefault(player.getClassId(), -1);
if ((classItemId != -1) && !hasQuestItems(player, classItemId))
if (CLASS_ITEMS.containsKey(player.getClassId()))
{
giveItems(player, classItemId, 1);
final int classItemId = CLASS_ITEMS.get(player.getClassId()).intValue();
if (!hasQuestItems(player, classItemId))
{
giveItems(player, classItemId, 1);
}
}
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_CRY_OF_DESTINY_PENDANT_WILL_BE_HELPFUL_TO_YOU_PLEASE_EQUIP_IT_AND_BRING_OUT_THE_POWER_OF_THE_PENDANT_TO_PREPARE_FOR_THE_NEXT_FIGHT);
htmltext = "33170-06.html";
@@ -494,7 +497,7 @@ public class EvilIncubator extends AbstractInstance
world.setParameter("WORLD_WAVE", waveId);
showOnScreenMsg(world, NpcStringId.I_DEATH_WOUND_CHAMPION_OF_SHILEN_SHALL_END_YOUR_WORLD, ExShowScreenMessage.TOP_CENTER, 5000, true);
getTimers().addTimer("SPAWN_WAVE", 20000, e -> manageWaveSpawn(world));
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()), BOSS_LOC, false, 0, false, world.getId());
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()).intValue(), BOSS_LOC, false, 0, false, world.getId());
world.broadcastPacket(new Earthquake(boss, 50, 10));
break;
}

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance
for (Entry<Integer, Long> entry : instanceTimes.entrySet())
{
// find instance with same name (kamaloka or labyrinth)
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey())))
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey().intValue())))
{
continue;
}
// if found instance still can't be reentered - exit
if (System.currentTimeMillis() < entry.getValue())
if (System.currentTimeMillis() < entry.getValue().longValue())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java vendored
View File

@@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI
for (Entry<WorldObject, Integer> entry : sortedHpMap.entrySet())
{
final WorldObject friend = entry.getKey();
final int percent = entry.getValue();
final int percent = entry.getValue().intValue();
if ((friend != null) && (percent < 80) && (percent > 1))
{
peopleToHeal.add(friend);

8
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java vendored
View File

@@ -85,7 +85,7 @@ public abstract class ThirdClassTransferQuest extends Quest
addTalkId(VANGUARDS);
for (Entry<Race, Integer> tag : RACE_TAGS.entrySet())
{
registerQuestItems(tag.getValue());
registerQuestItems(tag.getValue().intValue());
}
//@formatter:off
registerQuestItems(
@@ -157,7 +157,7 @@ public abstract class ThirdClassTransferQuest extends Quest
{
qs.setCond(4, true);
qs.unset("vanguard");
takeItems(player, RACE_TAGS.get(player.getRace()), -1);
takeItems(player, RACE_TAGS.get(player.getRace()).intValue(), -1);
htmltext = event;
}
break;
@@ -179,9 +179,9 @@ public abstract class ThirdClassTransferQuest extends Quest
final int vanguard = qs.getInt("vanguard");
if ((vanguard & bit) != bit)
{
giveItems(player, RACE_TAGS.get(player.getRace()), 1);
giveItems(player, RACE_TAGS.get(player.getRace()).intValue(), 1);
qs.set("vanguard", vanguard | bit);
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace())) == 4)
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace()).intValue()) == 4)
{
qs.setCond(3, true);
htmltext = "vanguard-04.html";

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java
View File

@@ -70,6 +70,6 @@ public enum StatusUpdateType
public int getValue(Creature creature)
{
return _valueSupplier.apply(creature);
return _valueSupplier.apply(creature).intValue();
}
}

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java
View File

@@ -59,7 +59,8 @@ public class EnchantSkillHolder
public long getSp(SkillEnchantType type)
{
return _sp.getOrDefault(type, 0L);
final Long val = _sp.get(type);
return val != null ? val.longValue() : 0;
}
public void addChance(SkillEnchantType type, int chance)
@@ -69,7 +70,8 @@ public class EnchantSkillHolder
public int getChance(SkillEnchantType type)
{
return _chance.getOrDefault(type, 100);
final Integer val = _chance.get(type);
return val != null ? val.intValue() : 100;
}
public void addRequiredItem(SkillEnchantType type, ItemHolder item)

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java
View File

@@ -65,7 +65,7 @@ public class EnchantRateItem
*/
public void setMagicWeapon(boolean magicWeapon)
{
_isMagicWeapon = magicWeapon;
_isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE;
}
/**
@@ -82,7 +82,7 @@ public class EnchantRateItem
{
return false;
}
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon))
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue()))
{
return false;
}

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@@ -51,7 +51,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : NORMAL_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingNormal = false;
@@ -67,7 +67,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : ATTACK_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingAttack = false;

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
View File

@@ -47,7 +47,7 @@ public class DecayTaskManager
final long time = System.currentTimeMillis();
for (Entry<Creature, Long> entry : DECAY_SCHEDULES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Creature creature = entry.getKey();
DECAY_SCHEDULES.remove(creature);
@@ -107,7 +107,7 @@ public class DecayTaskManager
public long getRemainingTime(Creature creature)
{
final Long time = DECAY_SCHEDULES.get(creature);
return time != null ? time - System.currentTimeMillis() : Long.MAX_VALUE;
return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE;
}
@Override
@@ -130,7 +130,7 @@ public class DecayTaskManager
ret.append('/');
ret.append(entry.getKey().getName());
ret.append(" decay timer: ");
ret.append(entry.getValue() - time);
ret.append(entry.getValue().longValue() - time);
ret.append(Config.EOL);
}

8
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java
View File

@@ -46,15 +46,15 @@ public class MessageDeletionTaskManager
}
_working = true;
int msgId;
Integer msgId;
Message msg;
final long time = System.currentTimeMillis();
for (Entry<Integer, Long> entry : PENDING_MESSAGES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
msgId = entry.getKey();
msg = MailManager.getInstance().getMessage(msgId);
msg = MailManager.getInstance().getMessage(msgId.intValue());
if (msg == null)
{
PENDING_MESSAGES.remove(msgId);
@@ -83,7 +83,7 @@ public class MessageDeletionTaskManager
}
}
MailManager.getInstance().deleteMessageInDb(msgId);
MailManager.getInstance().deleteMessageInDb(msgId.intValue());
PENDING_MESSAGES.remove(msgId);
}
}

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java
View File

@@ -46,7 +46,7 @@ public class RandomAnimationTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_ANIMATIONS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
if (npc.isInActiveRegion() && !npc.isDead() && !npc.isInCombat() && !npc.isMoving() && !npc.hasBlockActions())

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@@ -45,7 +45,7 @@ public class RespawnTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -333,7 +333,7 @@ public class AwakeningMaster extends AbstractNpcAI
{
if (player.isInCategory(ent.getKey()))
{
giveItems(player, ent.getValue(), 1);
giveItems(player, ent.getValue().intValue(), 1);
break;
}
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java vendored
View File

@@ -353,7 +353,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}
@@ -371,7 +371,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}
@@ -389,7 +389,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}
@@ -408,7 +408,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -217,7 +217,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -100,7 +100,7 @@ public class AirBind extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5));

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
@@ -63,7 +63,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{
@@ -70,9 +70,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java vendored
View File

@@ -80,7 +80,7 @@ public class DispelBySlot extends AbstractEffect
{
// Dispel transformations (buff and by GM)
final Short transformToDispel = _dispelAbnormals.get(AbnormalType.TRANSFORM);
if ((transformToDispel != null) && ((transformToDispel == effected.getTransformationId()) || (transformToDispel < 0)))
if ((transformToDispel != null) && ((transformToDispel.intValue() == effected.getTransformationId()) || (transformToDispel.intValue() < 0)))
{
effected.stopTransformation(true);
}
@@ -94,7 +94,7 @@ public class DispelBySlot extends AbstractEffect
}
final Short abnormalLevel = _dispelAbnormals.get(info.getSkill().getAbnormalType());
return (abnormalLevel != null) && ((abnormalLevel < 0) || (abnormalLevel >= info.getSkill().getAbnormalLvl()));
return (abnormalLevel != null) && ((abnormalLevel.shortValue() < 0) || (abnormalLevel.shortValue() >= info.getSkill().getAbnormalLvl()));
}, true, true);
}
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -179,7 +179,7 @@ public class KnockBack extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 3));

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@@ -141,7 +141,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect
// Skill specific mods.
final double weaponMod = effector.getAttackType().isRanged() ? 70 : 77;
final double weaponBonus = _weaponBonus.getOrDefault(effector.getAttackType(), 1.0);
final double weaponBonus = _weaponBonus.containsKey(effector.getAttackType()) ? _weaponBonus.get(effector.getAttackType()).doubleValue() : 1d;
final double power = _power + effector.getStat().getValue(Stat.SKILL_POWER_ADD, 0);
final double rangedBonus = effector.getAttackType().isRanged() ? attack + power : 0;
final double critMod = critical ? Formulas.calcCritDamage(effector, effected, skill) : 1;

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -117,7 +117,7 @@ public class RestorationRandom extends AbstractEffect
newItem.setEnchantLevel(Rnd.get(createdItem.getMinEnchant(), createdItem.getMaxEnchant()));
}
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + itemCount);
}
@@ -143,7 +143,7 @@ public class RestorationRandom extends AbstractEffect
playerIU.addModifiedItem(itemInstance);
}
}
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
player.sendPacket(playerIU);
}
@@ -155,7 +155,7 @@ public class RestorationRandom extends AbstractEffect
return EffectType.EXTRACT_ITEM;
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java vendored
View File

@@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect
{
for (Entry<Stat, Float> stats : _sharedStats.entrySet())
{
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue());
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue().floatValue());
}
}
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java vendored
View File

@@ -63,7 +63,7 @@ public class Transformation extends AbstractEffect
{
if (!_id.isEmpty())
{
effected.transform(_id.get(Rnd.get(_id.size())), true);
effected.transform(_id.get(Rnd.get(_id.size())).intValue(), true);
}
}

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler
for (Entry<ItemInstance, Long> entry : extractedItems.entrySet())
{
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
return true;
@@ -208,7 +208,7 @@ public class ExtractableItems implements IItemHandler
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem)
{
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + 1);
}
@@ -218,7 +218,7 @@ public class ExtractableItems implements IItemHandler
}
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

11
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java vendored
View File

@@ -260,10 +260,13 @@ public class EvilIncubator extends AbstractInstance
if (st.isCond(9))
{
st.setCond(10, true);
final int classItemId = CLASS_ITEMS.getOrDefault(player.getClassId(), -1);
if ((classItemId != -1) && !hasQuestItems(player, classItemId))
if (CLASS_ITEMS.containsKey(player.getClassId()))
{
giveItems(player, classItemId, 1);
final int classItemId = CLASS_ITEMS.get(player.getClassId()).intValue();
if (!hasQuestItems(player, classItemId))
{
giveItems(player, classItemId, 1);
}
}
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_CRY_OF_DESTINY_PENDANT_WILL_BE_HELPFUL_TO_YOU_PLEASE_EQUIP_IT_AND_BRING_OUT_THE_POWER_OF_THE_PENDANT_TO_PREPARE_FOR_THE_NEXT_FIGHT);
htmltext = "33170-06.html";
@@ -494,7 +497,7 @@ public class EvilIncubator extends AbstractInstance
world.setParameter("WORLD_WAVE", waveId);
showOnScreenMsg(world, NpcStringId.I_DEATH_WOUND_CHAMPION_OF_SHILEN_SHALL_END_YOUR_WORLD, ExShowScreenMessage.TOP_CENTER, 5000, true);
getTimers().addTimer("SPAWN_WAVE", 20000, e -> manageWaveSpawn(world));
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()), BOSS_LOC, false, 0, false, world.getId());
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()).intValue(), BOSS_LOC, false, 0, false, world.getId());
world.broadcastPacket(new Earthquake(boss, 50, 10));
break;
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance
for (Entry<Integer, Long> entry : instanceTimes.entrySet())
{
// find instance with same name (kamaloka or labyrinth)
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey())))
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey().intValue())))
{
continue;
}
// if found instance still can't be reentered - exit
if (System.currentTimeMillis() < entry.getValue())
if (System.currentTimeMillis() < entry.getValue().longValue())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java vendored
View File

@@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI
for (Entry<WorldObject, Integer> entry : sortedHpMap.entrySet())
{
final WorldObject friend = entry.getKey();
final int percent = entry.getValue();
final int percent = entry.getValue().intValue();
if ((friend != null) && (percent < 80) && (percent > 1))
{
peopleToHeal.add(friend);

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java vendored
View File

@@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest
addTalkId(VANGUARDS);
for (Entry<Race, Integer> tag : RACE_TAGS.entrySet())
{
registerQuestItems(tag.getValue());
registerQuestItems(tag.getValue().intValue());
}
//@formatter:off
registerQuestItems(
@@ -159,7 +159,7 @@ public abstract class ThirdClassTransferQuest extends Quest
{
qs.setCond(4, true);
qs.unset("vanguard");
takeItems(player, RACE_TAGS.get(player.getRace()), -1);
takeItems(player, RACE_TAGS.get(player.getRace()).intValue(), -1);
htmltext = event;
}
break;
@@ -181,9 +181,9 @@ public abstract class ThirdClassTransferQuest extends Quest
final int vanguard = qs.getInt("vanguard");
if ((vanguard & bit) != bit)
{
giveItems(player, RACE_TAGS.get(player.getRace()), 1);
giveItems(player, RACE_TAGS.get(player.getRace()).intValue(), 1);
qs.set("vanguard", vanguard | bit);
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace())) == 4)
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace()).intValue()) == 4)
{
qs.setCond(3, true);
htmltext = "vanguard-04.html";

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java
View File

@@ -70,6 +70,6 @@ public enum StatusUpdateType
public int getValue(Creature creature)
{
return _valueSupplier.apply(creature);
return _valueSupplier.apply(creature).intValue();
}
}

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java
View File

@@ -59,7 +59,8 @@ public class EnchantSkillHolder
public long getSp(SkillEnchantType type)
{
return _sp.getOrDefault(type, 0L);
final Long val = _sp.get(type);
return val != null ? val.longValue() : 0;
}
public void addChance(SkillEnchantType type, int chance)
@@ -69,7 +70,8 @@ public class EnchantSkillHolder
public int getChance(SkillEnchantType type)
{
return _chance.getOrDefault(type, 100);
final Integer val = _chance.get(type);
return val != null ? val.intValue() : 100;
}
public void addRequiredItem(SkillEnchantType type, ItemHolder item)

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java
View File

@@ -65,7 +65,7 @@ public class EnchantRateItem
*/
public void setMagicWeapon(boolean magicWeapon)
{
_isMagicWeapon = magicWeapon;
_isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE;
}
/**
@@ -82,7 +82,7 @@ public class EnchantRateItem
{
return false;
}
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon))
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue()))
{
return false;
}

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@@ -51,7 +51,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : NORMAL_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingNormal = false;
@@ -67,7 +67,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : ATTACK_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingAttack = false;

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
View File

@@ -47,7 +47,7 @@ public class DecayTaskManager
final long time = System.currentTimeMillis();
for (Entry<Creature, Long> entry : DECAY_SCHEDULES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Creature creature = entry.getKey();
DECAY_SCHEDULES.remove(creature);
@@ -107,7 +107,7 @@ public class DecayTaskManager
public long getRemainingTime(Creature creature)
{
final Long time = DECAY_SCHEDULES.get(creature);
return time != null ? time - System.currentTimeMillis() : Long.MAX_VALUE;
return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE;
}
@Override
@@ -130,7 +130,7 @@ public class DecayTaskManager
ret.append('/');
ret.append(entry.getKey().getName());
ret.append(" decay timer: ");
ret.append(entry.getValue() - time);
ret.append(entry.getValue().longValue() - time);
ret.append(Config.EOL);
}

8
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java
View File

@@ -46,15 +46,15 @@ public class MessageDeletionTaskManager
}
_working = true;
int msgId;
Integer msgId;
Message msg;
final long time = System.currentTimeMillis();
for (Entry<Integer, Long> entry : PENDING_MESSAGES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
msgId = entry.getKey();
msg = MailManager.getInstance().getMessage(msgId);
msg = MailManager.getInstance().getMessage(msgId.intValue());
if (msg == null)
{
PENDING_MESSAGES.remove(msgId);
@@ -83,7 +83,7 @@ public class MessageDeletionTaskManager
}
}
MailManager.getInstance().deleteMessageInDb(msgId);
MailManager.getInstance().deleteMessageInDb(msgId.intValue());
PENDING_MESSAGES.remove(msgId);
}
}

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java
View File

@@ -46,7 +46,7 @@ public class RandomAnimationTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_ANIMATIONS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
if (npc.isInActiveRegion() && !npc.isDead() && !npc.isInCombat() && !npc.isMoving() && !npc.hasBlockActions())

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@@ -45,7 +45,7 @@ public class RespawnTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -333,7 +333,7 @@ public class AwakeningMaster extends AbstractNpcAI
{
if (player.isInCategory(ent.getKey()))
{
giveItems(player, ent.getValue(), 1);
giveItems(player, ent.getValue().intValue(), 1);
break;
}
}

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java vendored
View File

@@ -353,7 +353,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}
@@ -371,7 +371,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}
@@ -389,7 +389,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}
@@ -408,7 +408,7 @@ public class AdventureGuildsman extends AbstractNpcAI
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -215,7 +215,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler
{
if (player.isInCategory(entry.getKey()))
{
multisellId = entry.getValue();
multisellId = entry.getValue().intValue();
break;
}
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -100,7 +100,7 @@ public class AirBind extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5));

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java vendored
View File

@@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
@@ -63,7 +63,7 @@ public class AttackTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _attackTraits.entrySet())
{
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue());
effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue());
}
}
}

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java vendored
View File

@@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().mergeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{
@@ -70,9 +70,9 @@ public class DefenceTrait extends AbstractEffect
{
for (Entry<TraitType, Float> trait : _defenceTraits.entrySet())
{
if (trait.getValue() < 1.0f)
if (trait.getValue().floatValue() < 1.0f)
{
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue());
effected.getStat().removeDefenceTrait(trait.getKey(), trait.getValue().floatValue());
}
else
{

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java vendored
View File

@@ -80,7 +80,7 @@ public class DispelBySlot extends AbstractEffect
{
// Dispel transformations (buff and by GM)
final Short transformToDispel = _dispelAbnormals.get(AbnormalType.TRANSFORM);
if ((transformToDispel != null) && ((transformToDispel == effected.getTransformationId()) || (transformToDispel < 0)))
if ((transformToDispel != null) && ((transformToDispel.intValue() == effected.getTransformationId()) || (transformToDispel.intValue() < 0)))
{
effected.stopTransformation(true);
}
@@ -94,7 +94,7 @@ public class DispelBySlot extends AbstractEffect
}
final Short abnormalLevel = _dispelAbnormals.get(info.getSkill().getAbnormalType());
return (abnormalLevel != null) && ((abnormalLevel < 0) || (abnormalLevel >= info.getSkill().getAbnormalLvl()));
return (abnormalLevel != null) && ((abnormalLevel.shortValue() < 0) || (abnormalLevel.shortValue() >= info.getSkill().getAbnormalLvl()));
}, true, true);
}
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -179,7 +179,7 @@ public class KnockBack extends AbstractEffect
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
{
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId());
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 3));

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@@ -141,7 +141,7 @@ public class PhysicalAttackWeaponBonus extends AbstractEffect
// Skill specific mods.
final double weaponMod = effector.getAttackType().isRanged() ? 70 : 77;
final double weaponBonus = _weaponBonus.getOrDefault(effector.getAttackType(), 1.0);
final double weaponBonus = _weaponBonus.containsKey(effector.getAttackType()) ? _weaponBonus.get(effector.getAttackType()).doubleValue() : 1d;
final double power = _power + effector.getStat().getValue(Stat.SKILL_POWER_ADD, 0);
final double rangedBonus = effector.getAttackType().isRanged() ? attack + power : 0;
final double critMod = critical ? Formulas.calcCritDamage(effector, effected, skill) : 1;

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -117,7 +117,7 @@ public class RestorationRandom extends AbstractEffect
newItem.setEnchantLevel(Rnd.get(createdItem.getMinEnchant(), createdItem.getMaxEnchant()));
}
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + itemCount);
}
@@ -143,7 +143,7 @@ public class RestorationRandom extends AbstractEffect
playerIU.addModifiedItem(itemInstance);
}
}
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
player.sendPacket(playerIU);
}
@@ -155,7 +155,7 @@ public class RestorationRandom extends AbstractEffect
return EffectType.EXTRACT_ITEM;
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java vendored
View File

@@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect
{
for (Entry<Stat, Float> stats : _sharedStats.entrySet())
{
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue());
effected.getStat().mergeAdd(stats.getKey(), owner.getStat().getValue(stats.getKey()) * stats.getValue().floatValue());
}
}
}

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java vendored
View File

@@ -63,7 +63,7 @@ public class Transformation extends AbstractEffect
{
if (!_id.isEmpty())
{
effected.transform(_id.get(Rnd.get(_id.size())), true);
effected.transform(_id.get(Rnd.get(_id.size())).intValue(), true);
}
}

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler
for (Entry<ItemInstance, Long> entry : extractedItems.entrySet())
{
sendMessage(player, entry.getKey(), entry.getValue());
sendMessage(player, entry.getKey(), entry.getValue().longValue());
}
return true;
@@ -208,7 +208,7 @@ public class ExtractableItems implements IItemHandler
private void addItem(Map<ItemInstance, Long> extractedItems, ItemInstance newItem)
{
if (extractedItems.get(newItem) != null)
if (extractedItems.containsKey(newItem))
{
extractedItems.put(newItem, extractedItems.get(newItem) + 1);
}
@@ -218,7 +218,7 @@ public class ExtractableItems implements IItemHandler
}
}
private void sendMessage(PlayerInstance player, ItemInstance item, Long count)
private void sendMessage(PlayerInstance player, ItemInstance item, long count)
{
final SystemMessage sm;
if (count > 1)

11
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java vendored
View File

@@ -260,10 +260,13 @@ public class EvilIncubator extends AbstractInstance
if (st.isCond(9))
{
st.setCond(10, true);
final int classItemId = CLASS_ITEMS.getOrDefault(player.getClassId(), -1);
if ((classItemId != -1) && !hasQuestItems(player, classItemId))
if (CLASS_ITEMS.containsKey(player.getClassId()))
{
giveItems(player, classItemId, 1);
final int classItemId = CLASS_ITEMS.get(player.getClassId()).intValue();
if (!hasQuestItems(player, classItemId))
{
giveItems(player, classItemId, 1);
}
}
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THE_CRY_OF_DESTINY_PENDANT_WILL_BE_HELPFUL_TO_YOU_PLEASE_EQUIP_IT_AND_BRING_OUT_THE_POWER_OF_THE_PENDANT_TO_PREPARE_FOR_THE_NEXT_FIGHT);
htmltext = "33170-06.html";
@@ -494,7 +497,7 @@ public class EvilIncubator extends AbstractInstance
world.setParameter("WORLD_WAVE", waveId);
showOnScreenMsg(world, NpcStringId.I_DEATH_WOUND_CHAMPION_OF_SHILEN_SHALL_END_YOUR_WORLD, ExShowScreenMessage.TOP_CENTER, 5000, true);
getTimers().addTimer("SPAWN_WAVE", 20000, e -> manageWaveSpawn(world));
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()), BOSS_LOC, false, 0, false, world.getId());
final Npc boss = addSpawn(CLASS_BOSS.get(world.getFirstPlayer().getClassId()).intValue(), BOSS_LOC, false, 0, false, world.getId());
world.broadcastPacket(new Earthquake(boss, 50, 10));
break;
}

4
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance
for (Entry<Integer, Long> entry : instanceTimes.entrySet())
{
// find instance with same name (kamaloka or labyrinth)
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey())))
if (!instanceName.equals(InstanceManager.getInstance().getInstanceName(entry.getKey().intValue())))
{
continue;
}
// if found instance still can't be reentered - exit
if (System.currentTimeMillis() < entry.getValue())
if (System.currentTimeMillis() < entry.getValue().longValue())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java vendored
View File

@@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI
for (Entry<WorldObject, Integer> entry : sortedHpMap.entrySet())
{
final WorldObject friend = entry.getKey();
final int percent = entry.getValue();
final int percent = entry.getValue().intValue();
if ((friend != null) && (percent < 80) && (percent > 1))
{
peopleToHeal.add(friend);

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java vendored
View File

@@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest
addTalkId(VANGUARDS);
for (Entry<Race, Integer> tag : RACE_TAGS.entrySet())
{
registerQuestItems(tag.getValue());
registerQuestItems(tag.getValue().intValue());
}
//@formatter:off
registerQuestItems(
@@ -159,7 +159,7 @@ public abstract class ThirdClassTransferQuest extends Quest
{
qs.setCond(4, true);
qs.unset("vanguard");
takeItems(player, RACE_TAGS.get(player.getRace()), -1);
takeItems(player, RACE_TAGS.get(player.getRace()).intValue(), -1);
htmltext = event;
}
break;
@@ -181,9 +181,9 @@ public abstract class ThirdClassTransferQuest extends Quest
final int vanguard = qs.getInt("vanguard");
if ((vanguard & bit) != bit)
{
giveItems(player, RACE_TAGS.get(player.getRace()), 1);
giveItems(player, RACE_TAGS.get(player.getRace()).intValue(), 1);
qs.set("vanguard", vanguard | bit);
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace())) == 4)
if (getQuestItemsCount(player, RACE_TAGS.get(player.getRace()).intValue()) == 4)
{
qs.setCond(3, true);
htmltext = "vanguard-04.html";

8
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java
View File

@@ -141,9 +141,9 @@ public class OfflineTraderTable
for (Entry<Integer, Long> entry : pc.getManufactureItems().entrySet())
{
stmItems.setInt(1, pc.getObjectId());
stmItems.setInt(2, entry.getKey());
stmItems.setInt(2, entry.getKey().intValue());
stmItems.setLong(3, 0);
stmItems.setLong(4, entry.getValue());
stmItems.setLong(4, entry.getValue().longValue());
stmItems.executeUpdate();
stmItems.clearParameters();
}
@@ -414,9 +414,9 @@ public class OfflineTraderTable
for (Entry<Integer, Long> entry : trader.getManufactureItems().entrySet())
{
stm3.setInt(1, trader.getObjectId());
stm3.setInt(2, entry.getKey());
stm3.setInt(2, entry.getKey().intValue());
stm3.setLong(3, 0);
stm3.setLong(4, entry.getValue());
stm3.setLong(4, entry.getValue().longValue());
stm3.executeUpdate();
stm3.clearParameters();
}

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java
View File

@@ -70,6 +70,6 @@ public enum StatusUpdateType
public int getValue(Creature creature)
{
return _valueSupplier.apply(creature);
return _valueSupplier.apply(creature).intValue();
}
}

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java
View File

@@ -59,7 +59,8 @@ public class EnchantSkillHolder
public long getSp(SkillEnchantType type)
{
return _sp.getOrDefault(type, 0L);
final Long val = _sp.get(type);
return val != null ? val.longValue() : 0;
}
public void addChance(SkillEnchantType type, int chance)
@@ -69,7 +70,8 @@ public class EnchantSkillHolder
public int getChance(SkillEnchantType type)
{
return _chance.getOrDefault(type, 100);
final Integer val = _chance.get(type);
return val != null ? val.intValue() : 100;
}
public void addRequiredItem(SkillEnchantType type, ItemHolder item)

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java
View File

@@ -65,7 +65,7 @@ public class EnchantRateItem
*/
public void setMagicWeapon(boolean magicWeapon)
{
_isMagicWeapon = magicWeapon;
_isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE;
}
/**
@@ -82,7 +82,7 @@ public class EnchantRateItem
{
return false;
}
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon))
else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue()))
{
return false;
}

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java
View File

@@ -51,7 +51,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : NORMAL_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingNormal = false;
@@ -67,7 +67,7 @@ public class CreatureFollowTaskManager
for (Entry<Creature, Integer> entry : ATTACK_FOLLOW_CREATURES.entrySet())
{
follow(entry.getKey(), entry.getValue());
follow(entry.getKey(), entry.getValue().intValue());
}
_workingAttack = false;

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java
View File

@@ -47,7 +47,7 @@ public class DecayTaskManager
final long time = System.currentTimeMillis();
for (Entry<Creature, Long> entry : DECAY_SCHEDULES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Creature creature = entry.getKey();
DECAY_SCHEDULES.remove(creature);
@@ -107,7 +107,7 @@ public class DecayTaskManager
public long getRemainingTime(Creature creature)
{
final Long time = DECAY_SCHEDULES.get(creature);
return time != null ? time - System.currentTimeMillis() : Long.MAX_VALUE;
return time != null ? time.longValue() - System.currentTimeMillis() : Long.MAX_VALUE;
}
@Override
@@ -130,7 +130,7 @@ public class DecayTaskManager
ret.append('/');
ret.append(entry.getKey().getName());
ret.append(" decay timer: ");
ret.append(entry.getValue() - time);
ret.append(entry.getValue().longValue() - time);
ret.append(Config.EOL);
}

8
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java
View File

@@ -46,15 +46,15 @@ public class MessageDeletionTaskManager
}
_working = true;
int msgId;
Integer msgId;
Message msg;
final long time = System.currentTimeMillis();
for (Entry<Integer, Long> entry : PENDING_MESSAGES.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
msgId = entry.getKey();
msg = MailManager.getInstance().getMessage(msgId);
msg = MailManager.getInstance().getMessage(msgId.intValue());
if (msg == null)
{
PENDING_MESSAGES.remove(msgId);
@@ -83,7 +83,7 @@ public class MessageDeletionTaskManager
}
}
MailManager.getInstance().deleteMessageInDb(msgId);
MailManager.getInstance().deleteMessageInDb(msgId.intValue());
PENDING_MESSAGES.remove(msgId);
}
}

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java
View File

@@ -46,7 +46,7 @@ public class RandomAnimationTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_ANIMATIONS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
if (npc.isInActiveRegion() && !npc.isDead() && !npc.isInCombat() && !npc.isMoving() && !npc.hasBlockActions())

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java
View File

@@ -45,7 +45,7 @@ public class RespawnTaskManager
final long time = System.currentTimeMillis();
for (Entry<Npc, Long> entry : PENDING_RESPAWNS.entrySet())
{
if (time > entry.getValue())
if (time > entry.getValue().longValue())
{
final Npc npc = entry.getKey();
PENDING_RESPAWNS.remove(npc);

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java vendored
View File

@@ -333,7 +333,7 @@ public class AwakeningMaster extends AbstractNpcAI
{
if (player.isInCategory(ent.getKey()))
{
giveItems(player, ent.getValue(), 1);
giveItems(player, ent.getValue().intValue(), 1);
break;
}
}

Some files were not shown because too many files have changed in this diff Show More