lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More ConsumeBody effect changes.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}

10
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
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();
}
}
}