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 bfb04ffdbb..3f8dfc0232 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 bfb04ffdbb..3f8dfc0232 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 bfb04ffdbb..3f8dfc0232 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 bfb04ffdbb..3f8dfc0232 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 bfb04ffdbb..3f8dfc0232 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 bfb04ffdbb..3f8dfc0232 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 2d6a0d4838..52d9e8537d 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 ab01f5c561..ca77710832 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 ab01f5c561..ca77710832 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 ab01f5c561..ca77710832 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 ab01f5c561..ca77710832 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{
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 ab01f5c561..ca77710832 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
@@ -1677,6 +1677,16 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return true;
 	}
 	
+	@Override
+	public boolean decayMe()
+	{
+		if (hasAI())
+		{
+			getAI().stopAITask();
+		}
+		return super.decayMe();
+	}
+	
 	@Override
 	public boolean deleteMe()
 	{