From a7b1b8cf48d9be2e901bac834b5c889d73e0c904 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 18 Apr 2021 19:09:50 +0000
Subject: [PATCH] Stop effects for all attackables. Contributed by Iris.

---
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java     | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 54d703eb8a..d408538000 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 54d703eb8a..d408538000 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1a78804e2e..648103bda1 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1a78804e2e..648103bda1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 2dbaab6310..9605bff30d 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 2dbaab6310..9605bff30d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 2dbaab6310..9605bff30d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 6190609b48..88efb80836 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 0162abfcad..6eacc88952 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 0162abfcad..6eacc88952 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1b91c71221..a55a4eb657 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2404,7 +2404,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index aa0809e2d4..21ef5fb079 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2406,7 +2406,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 27c45ec518..883b2abf82 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 27c45ec518..883b2abf82 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c42ecba96d..019cd57d67 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index cac9f1c084..90dc6de2bf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1680,7 +1680,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index cac9f1c084..90dc6de2bf 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1680,7 +1680,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c4fbece592..75e285d055 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1680,7 +1680,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 27c45ec518..883b2abf82 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1679,7 +1679,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 56111935d4..6c5942a1a3 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1683,7 +1683,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 3424f3e31d..c7f959350a 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -1690,7 +1690,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		// Stop HP/MP/CP Regeneration task
 		_status.stopHpMpRegeneration();
 		
-		if (isMonster())
+		if (isAttackable())
 		{
 			final Spawn spawn = ((Npc) this).getSpawn();
 			if ((spawn != null) && spawn.isRespawnEnabled())