From cccaa62d6ee6ac1144ea78fab231a28e9ce25fe5 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 28 Nov 2018 10:25:52 +0000
Subject: [PATCH] More ConsumeBody effect changes.

---
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 .../scripts/handlers/effecthandlers/ConsumeBody.java   | 10 ++++------
 10 files changed, 40 insertions(+), 60 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
index 42e743e466..7cb9ebf9f5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java
@@ -19,7 +19,6 @@ package handlers.effecthandlers;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.L2Summon;
 import com.l2jmobius.gameserver.model.effects.AbstractEffect;
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
@@ -43,7 +42,10 @@ public final class ConsumeBody extends AbstractEffect
 	@Override
 	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
 	{
-		if (!effected.isDead() || (!effected.isNpc() && !effected.isSummon()))
+		if (!effected.isDead() //
+			|| (effector.getTarget() != effected) //
+			|| (!effected.isNpc() && !effected.isSummon()) //
+			|| (effected.isSummon() && (effector != effected.getActingPlayer())))
 		{
 			return;
 		}
@@ -52,9 +54,5 @@ public final class ConsumeBody extends AbstractEffect
 		{
 			((L2Npc) effected).endDecayTask();
 		}
-		else
-		{
-			((L2Summon) effected).deleteMe();
-		}
 	}
 }