More ConsumeBody effect changes.

This commit is contained in:
MobiusDev
2018-11-28 10:25:52 +00:00
parent 3e0b281e89
commit cccaa62d6e
10 changed files with 40 additions and 60 deletions

View File

@@ -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();
}
}
}