Remove active skill effects if monster set to respawn.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -64,6 +64,7 @@ import org.l2jmobius.gameserver.model.EffectList;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -2402,9 +2403,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -74,6 +74,7 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
+import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1649,9 +1650,17 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.stopHpMpRegeneration();
 		
 		if (isMonster())
+		{
+			final Spawn spawn = ((Npc) this).getSpawn();
+			if ((spawn != null) && spawn.isRespawnEnabled())
+			{
+				stopAllEffects();
+			}
+			else
 			{
 				_effectList.stopAllEffectsWithoutExclusions(true, true);
 			}
+		}
 		else
 		{
 			stopAllEffectsExceptThoseThatLastThroughDeath();