Do not apply unequip skill for secondary agathions.

This commit is contained in:
MobiusDevelopment 2020-12-25 02:21:00 +00:00
parent 6988c207b2
commit 11a07d38a8
10 changed files with 60 additions and 20 deletions

View File

@ -434,8 +434,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -458,8 +458,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -434,8 +434,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();

View File

@ -457,8 +457,12 @@ public abstract class Inventory extends ItemContainer
}
}
// Apply skill, if weapon have "skills on unequip"
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
// Apply skill, if item has "skills on unequip" and it is not a secondary agathion.
if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5))
{
it.forEachSkill(ItemSkillType.ON_UNEQUIP, holder -> holder.getSkill().activateSkill(player, player));
}
if (update)
{
player.sendSkillList();