Minor adjustment for previous commit.
This commit is contained in:
@@ -395,7 +395,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -403,7 +403,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -426,7 +426,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -426,7 +426,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -403,7 +403,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -426,7 +426,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
@@ -426,7 +426,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Must check for toggle skill item conditions.
|
// Must check for toggle skill item conditions.
|
||||||
for (Skill skill : player.getSkills().values())
|
for (Skill skill : player.getAllSkills())
|
||||||
{
|
{
|
||||||
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
if (skill.isToggle() && player.isAffectedBySkill(skill.getId()) && !skill.checkConditions(SkillConditionScope.GENERAL, player, player))
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user