From f17155b4f072464eb979b05ac597672037917b1d Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 14 Jun 2020 21:09:20 +0000
Subject: [PATCH] Fixed passive effects not applied when conditions are met.
 Contributed by Sahar.

---
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 .../java/org/l2jmobius/gameserver/model/EffectList.java     | 6 ------
 .../l2jmobius/gameserver/model/itemcontainer/Inventory.java | 2 ++
 .../java/org/l2jmobius/gameserver/model/skills/Skill.java   | 2 +-
 45 files changed, 45 insertions(+), 105 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index c0ee71b080..9ebd6a6d05 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1251,6 +1251,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4a151fc398..018fadb399 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4a151fc398..018fadb399 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
index 46410ab520..c1c9a1008b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -926,12 +926,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 2503488262..6e6e582cb4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index ec8d53e4f4..8f4fc10cbd 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1286,6 +1286,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 15e5d0888d..18abddcbb4 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 15e5d0888d..18abddcbb4 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
index 92d623682d..f7c301ddc1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected(), true))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 9d2c705b43..e5938d27a8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1355,6 +1355,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 8da4cfa9e9..a1f1e4966b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4a151fc398..018fadb399 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4a151fc398..018fadb399 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4963d92d33..c947a8c7c3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1286,6 +1286,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 0d2b0a2841..20bd66e416 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 0d2b0a2841..20bd66e416 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
index 92d623682d..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected(), true))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 378edc56f8..ac18bd2dbd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1355,6 +1355,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 8da4cfa9e9..a1f1e4966b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
index 78596bd21e..f7c301ddc1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -922,12 +922,6 @@ public class EffectList
 			LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
 		}
 		
-		// Check for passive skill conditions.
-		if (!skill.checkCondition(info.getEffector(), info.getEffected()))
-		{
-			return;
-		}
-		
 		// Remove previous passives of this id.
 		_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
 		{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 4a151fc398..018fadb399 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
 				item.updateDatabase();
 			}
 			
+			getOwner().getStat().recalculateStats(!getOwner().isPlayer());
+			
 			if (getOwner().isPlayer())
 			{
 				getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java
index 3510b53af8..d5d7f67e30 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
 			}
 		}
 		
-		if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
+		if (passive)
 		{
 			final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
 			applyEffectScope(EffectScope.GENERAL, info, false, true);