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

Unboxing preventions for AutoUseTaskManager.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-09-23 04:51:44 +00:00
parent 2ae32cd28d
commit 15808c4955
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -65,9 +65,9 @@ public class AutoUseTaskManager
if (Config.ENABLE_AUTO_ITEM) if (Config.ENABLE_AUTO_ITEM)
{ {
ITEMS: for (int itemId : player.getAutoUseSettings().getAutoSupplyItems()) ITEMS: for (Integer itemId : player.getAutoUseSettings().getAutoSupplyItems())
{ {
final ItemInstance item = player.getInventory().getItemByItemId(itemId); final ItemInstance item = player.getInventory().getItemByItemId(itemId.intValue());
if (item == null) if (item == null)
{ {
player.getAutoUseSettings().getAutoSupplyItems().remove(itemId); player.getAutoUseSettings().getAutoSupplyItems().remove(itemId);
@ -98,9 +98,9 @@ public class AutoUseTaskManager
if (Config.ENABLE_AUTO_POTION && (player.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPotionPercent())) if (Config.ENABLE_AUTO_POTION && (player.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPotionPercent()))
{ {
POTIONS: for (int itemId : player.getAutoUseSettings().getAutoPotionItems()) POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPotionItems())
{ {
final ItemInstance item = player.getInventory().getItemByItemId(itemId); final ItemInstance item = player.getInventory().getItemByItemId(itemId.intValue());
if (item == null) if (item == null)
{ {
player.getAutoUseSettings().getAutoPotionItems().remove(itemId); player.getAutoUseSettings().getAutoPotionItems().remove(itemId);
@ -121,15 +121,15 @@ public class AutoUseTaskManager
if (Config.ENABLE_AUTO_BUFF) if (Config.ENABLE_AUTO_BUFF)
{ {
BUFFS: for (int skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; // TODO: break? continue BUFFS; // TODO: break?
} }
if (!player.isAffectedBySkill(skillId) && !player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, player, false)) if (!player.isAffectedBySkill(skillId.intValue()) && !player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, player, false))
{ {
// Summon check. // Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@ -141,7 +141,7 @@ public class AutoUseTaskManager
int occurrences = 0; int occurrences = 0;
for (Summon servitor : player.getServitors().values()) for (Summon servitor : player.getServitors().values())
{ {
if (servitor.isAffectedBySkill(skillId)) if (servitor.isAffectedBySkill(skillId.intValue()))
{ {
occurrences++; occurrences++;
} }

16
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@ -65,9 +65,9 @@ public class AutoUseTaskManager
if (Config.ENABLE_AUTO_ITEM) if (Config.ENABLE_AUTO_ITEM)
{ {
ITEMS: for (int itemId : player.getAutoUseSettings().getAutoSupplyItems()) ITEMS: for (Integer itemId : player.getAutoUseSettings().getAutoSupplyItems())
{ {
final ItemInstance item = player.getInventory().getItemByItemId(itemId); final ItemInstance item = player.getInventory().getItemByItemId(itemId.intValue());
if (item == null) if (item == null)
{ {
player.getAutoUseSettings().getAutoSupplyItems().remove(itemId); player.getAutoUseSettings().getAutoSupplyItems().remove(itemId);
@ -98,9 +98,9 @@ public class AutoUseTaskManager
if (Config.ENABLE_AUTO_POTION && (player.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPotionPercent())) if (Config.ENABLE_AUTO_POTION && (player.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPotionPercent()))
{ {
POTIONS: for (int itemId : player.getAutoUseSettings().getAutoPotionItems()) POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPotionItems())
{ {
final ItemInstance item = player.getInventory().getItemByItemId(itemId); final ItemInstance item = player.getInventory().getItemByItemId(itemId.intValue());
if (item == null) if (item == null)
{ {
player.getAutoUseSettings().getAutoPotionItems().remove(itemId); player.getAutoUseSettings().getAutoPotionItems().remove(itemId);
@ -121,15 +121,15 @@ public class AutoUseTaskManager
if (Config.ENABLE_AUTO_BUFF) if (Config.ENABLE_AUTO_BUFF)
{ {
BUFFS: for (int skillId : player.getAutoUseSettings().getAutoSkills()) BUFFS: for (Integer skillId : player.getAutoUseSettings().getAutoSkills())
{ {
final Skill skill = player.getKnownSkill(skillId); final Skill skill = player.getKnownSkill(skillId.intValue());
if (skill == null) if (skill == null)
{ {
player.getAutoUseSettings().getAutoSkills().remove(skillId); player.getAutoUseSettings().getAutoSkills().remove(skillId);
continue BUFFS; // TODO: break? continue BUFFS; // TODO: break?
} }
if (!player.isAffectedBySkill(skillId) && !player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, player, false)) if (!player.isAffectedBySkill(skillId.intValue()) && !player.hasSkillReuse(skill.getReuseHashCode()) && skill.checkCondition(player, player, false))
{ {
// Summon check. // Summon check.
if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER) if (skill.getAffectScope() == AffectScope.SUMMON_EXCEPT_MASTER)
@ -141,7 +141,7 @@ public class AutoUseTaskManager
int occurrences = 0; int occurrences = 0;
for (Summon servitor : player.getServitors().values()) for (Summon servitor : player.getServitors().values())
{ {
if (servitor.isAffectedBySkill(skillId)) if (servitor.isAffectedBySkill(skillId.intValue()))
{ {
occurrences++; occurrences++;
} }