diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 44208cfc2a..2a6e05bf25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index 4e78da8a7f..d9f4735d61 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -217,7 +217,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 73d46e6165..08a221cbca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index a4be1678d1..5c0e440c13 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index e593cb962f..86ffa34493 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -85,7 +85,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 76963b0c7d..65146ba0fa 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 44208cfc2a..2a6e05bf25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index c6d404b593..73ea7743c1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -217,7 +217,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b5c889aa69..73afa97f34 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index a4be1678d1..5c0e440c13 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index e593cb962f..86ffa34493 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -85,7 +85,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 44208cfc2a..2a6e05bf25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java index 3a2830a261..54e162516b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java @@ -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; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index c6d404b593..73ea7743c1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -217,7 +217,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b5c889aa69..73afa97f34 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index a4be1678d1..5c0e440c13 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 1bccd78022..a6f9c3f47c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 44208cfc2a..2a6e05bf25 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java index 3a2830a261..54e162516b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java @@ -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; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index c701dab1aa..11c54e17f4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -215,7 +215,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b5c889aa69..73afa97f34 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index a4be1678d1..5c0e440c13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 1bccd78022..a6f9c3f47c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 4a1cb2d77e..9bcb67f4c9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -141,9 +141,9 @@ public class OfflineTraderTable for (Entry 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 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(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 44208cfc2a..2a6e05bf25 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java index 77502cc6fa..82e72e6fb1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java @@ -351,7 +351,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -369,7 +369,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -387,7 +387,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -406,7 +406,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index c701dab1aa..11c54e17f4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -215,7 +215,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b5c889aa69..73afa97f34 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index a4be1678d1..5c0e440c13 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 1bccd78022..a6f9c3f47c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 4a1cb2d77e..9bcb67f4c9 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -141,9 +141,9 @@ public class OfflineTraderTable for (Entry 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 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(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4784dc2832..fd4cb9dbac 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java index 77502cc6fa..82e72e6fb1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java @@ -351,7 +351,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -369,7 +369,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -387,7 +387,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -406,7 +406,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index f96d02ce1e..1185cb5dc8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -215,7 +215,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b5c889aa69..73afa97f34 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index a4be1678d1..5c0e440c13 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 1bccd78022..a6f9c3f47c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 4a1cb2d77e..9bcb67f4c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -141,9 +141,9 @@ public class OfflineTraderTable for (Entry 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 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(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 4784dc2832..fd4cb9dbac 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -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; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java index 77502cc6fa..82e72e6fb1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java @@ -351,7 +351,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -369,7 +369,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -387,7 +387,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -406,7 +406,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index f96d02ce1e..1185cb5dc8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -215,7 +215,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b5c889aa69..73afa97f34 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index be21ed80ef..8054e0ed0d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -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; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 54bd017656..4584863d92 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 1bccd78022..a6f9c3f47c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 4a1cb2d77e..9bcb67f4c9 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -141,9 +141,9 @@ public class OfflineTraderTable for (Entry 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 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(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 9c89b9028f..a445bd8f77 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -298,7 +298,7 @@ public class AwakeningMaster extends AbstractNpcAI { if (player.isInCategory(ent.getKey())) { - giveItems(player, ent.getValue(), 1); + giveItems(player, ent.getValue().intValue(), 1); break; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java index 77502cc6fa..82e72e6fb1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/AdventureGuildsman/AdventureGuildsman.java @@ -351,7 +351,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -369,7 +369,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -387,7 +387,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } @@ -406,7 +406,7 @@ public class AdventureGuildsman extends AbstractNpcAI { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java index f96d02ce1e..1185cb5dc8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java @@ -215,7 +215,7 @@ public class OlyManager extends AbstractNpcAI implements IBypassHandler { if (player.isInCategory(entry.getKey())) { - multisellId = entry.getValue(); + multisellId = entry.getValue().intValue(); break; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index a52a84da26..b3e0609108 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -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)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 4d972ccdcb..ce5599a94f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -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)); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 851eb244a4..90a539ceb4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 51c3c6623b..7870b3093d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java index c66ad9542e..4d50292ee6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/EvilIncubator/EvilIncubator.java @@ -254,10 +254,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; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 6b7a7803dd..1d03bf085f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -464,12 +464,12 @@ public class Kamaloka extends AbstractInstance for (Entry 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); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java index 5b06c81c67..28fbb118c4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiaHelperElise.java @@ -173,7 +173,7 @@ public class KartiaHelperElise extends AbstractNpcAI for (Entry 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); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java index e84b2e2664..9f85a5102b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java @@ -328,7 +328,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest if (player.isInCategory(ent.getKey())) { player.getVariables().set(AWAKE_POWER_REWARDED_VAR, true); - giveItems(player, ent.getValue(), 1); + giveItems(player, ent.getValue().intValue(), 1); break; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java index 1bccd78022..a6f9c3f47c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java @@ -87,7 +87,7 @@ public abstract class ThirdClassTransferQuest extends Quest addTalkId(VANGUARDS); for (Entry 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"; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java index 4a1cb2d77e..9bcb67f4c9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/OfflineTraderTable.java @@ -141,9 +141,9 @@ public class OfflineTraderTable for (Entry 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 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(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index a33d64a9d9..5fb6489c4d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index a7755a8b8c..104afd7a0c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -87,7 +87,7 @@ public class DecayTaskManager { delay = 8500; } - if ((current - entry.getValue()) > delay) + if ((current - entry.getValue().longValue()) > delay) { actor.onDecay(); _decayTasks.remove(actor); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index e687350cb9..aea81e1b39 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final NpcInstance npc = entry.getKey(); if (npc.isInActiveRegion() && !npc.isDead() && !npc.isInCombat() && !npc.isMoving() && !npc.isStunned() && !npc.isSleeping() && !npc.isParalyzed()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 5bfdebd327..fc679f80d2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final NpcInstance npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index a33d64a9d9..5fb6489c4d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index a7755a8b8c..104afd7a0c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -87,7 +87,7 @@ public class DecayTaskManager { delay = 8500; } - if ((current - entry.getValue()) > delay) + if ((current - entry.getValue().longValue()) > delay) { actor.onDecay(); _decayTasks.remove(actor); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index e687350cb9..aea81e1b39 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_ANIMATIONS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final NpcInstance npc = entry.getKey(); if (npc.isInActiveRegion() && !npc.isDead() && !npc.isInCombat() && !npc.isMoving() && !npc.isStunned() && !npc.isSleeping() && !npc.isParalyzed()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 5bfdebd327..fc679f80d2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final NpcInstance npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 046565b087..a4456c7431 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 681edccc86..8503a0ef2a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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.isStunned() && !npc.isSleeping() && !npc.isParalyzed()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 046565b087..a4456c7431 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 681edccc86..8503a0ef2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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.isStunned() && !npc.isSleeping() && !npc.isParalyzed()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 9e0e839a36..ff3ed9c2c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index de23beb8bb..726411e625 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index de23beb8bb..726411e625 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index de23beb8bb..726411e625 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index de23beb8bb..726411e625 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 84d1b1f011..2bf023dea0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -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) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index de23beb8bb..726411e625 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -200,7 +200,7 @@ public class ExtractableItems implements IItemHandler for (Entry 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 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) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 409c99b306..b08fe730d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index 5fbdbd17c7..299f8b9e8f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -54,7 +54,7 @@ public class AttackTrait extends AbstractEffect { for (Entry 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 trait : _attackTraits.entrySet()) { - effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue()); + effected.getStat().removeAttackTrait(trait.getKey(), trait.getValue().floatValue()); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 43dda1e8fb..0cfd812bbb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -54,9 +54,9 @@ public class DefenceTrait extends AbstractEffect { for (Entry 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 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 { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3f952d8dc4..c0258bae9c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -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); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 833eac9ae4..11c91b129a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -108,7 +108,7 @@ public class KnockBack extends AbstractEffect ACTIVE_KNOCKBACKS.add(effected); // Prevent knocking back raids and town NPCs. - if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) + if (effected.isRaid() || (effected.isNpc() && !effected.isAttackable())) { return; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4f29f685f7..b58383fe33 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index b3c9ccfa7c..f87eaa1aec 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -131,7 +131,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); } @@ -157,7 +157,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); } @@ -169,7 +169,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) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index d0154127eb..971188c7ff 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -61,7 +61,7 @@ public class ServitorShare extends AbstractEffect { for (Entry 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()); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 6ecd644949..3ba59a306b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -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); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index db664b2f96..3d808975ca 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -201,7 +201,7 @@ public class ExtractableItems implements IItemHandler for (Entry entry : extractedItems.entrySet()) { - sendMessage(player, entry.getKey(), entry.getValue()); + sendMessage(player, entry.getKey(), entry.getValue().longValue()); } return true; @@ -216,7 +216,7 @@ public class ExtractableItems implements IItemHandler return; } - if (extractedItems.get(newItem) != null) + if (extractedItems.containsKey(newItem)) { extractedItems.put(newItem, extractedItems.get(newItem) + 1); } @@ -226,7 +226,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) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java index 6a1c091655..a5b06e478c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/StatusUpdateType.java @@ -70,6 +70,6 @@ public enum StatusUpdateType public int getValue(Creature creature) { - return _valueSupplier.apply(creature); + return _valueSupplier.apply(creature).intValue(); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java index 6d39a1340c..e9caf84efc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/EnchantSkillHolder.java @@ -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) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java index 6552b987f3..abec6b5c2e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java @@ -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; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java index 09899bab14..ad6635aebf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/CreatureFollowTaskManager.java @@ -51,7 +51,7 @@ public class CreatureFollowTaskManager for (Entry 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 entry : ATTACK_FOLLOW_CREATURES.entrySet()) { - follow(entry.getKey(), entry.getValue()); + follow(entry.getKey(), entry.getValue().intValue()); } _workingAttack = false; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java index 134e60fee4..8b4a7db319 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/DecayTaskManager.java @@ -47,7 +47,7 @@ public class DecayTaskManager final long time = System.currentTimeMillis(); for (Entry 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); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java index b091a5a98b..05638be656 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/MessageDeletionTaskManager.java @@ -46,15 +46,15 @@ public class MessageDeletionTaskManager } _working = true; - int msgId; + Integer msgId; Message msg; final long time = System.currentTimeMillis(); for (Entry 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); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java index 1fa8e74324..5473f21a8f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RandomAnimationTaskManager.java @@ -46,7 +46,7 @@ public class RandomAnimationTaskManager final long time = System.currentTimeMillis(); for (Entry 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()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java index 578bae59f1..8e8e818908 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/RespawnTaskManager.java @@ -45,7 +45,7 @@ public class RespawnTaskManager final long time = System.currentTimeMillis(); for (Entry entry : PENDING_RESPAWNS.entrySet()) { - if (time > entry.getValue()) + if (time > entry.getValue().longValue()) { final Npc npc = entry.getKey(); PENDING_RESPAWNS.remove(npc);