Summons should not PvP flag after getting stunned.

This commit is contained in:
MobiusDev
2019-02-05 05:13:22 +00:00
parent e350784c95
commit b1f1cb8568
11 changed files with 98 additions and 21 deletions

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -59,7 +59,14 @@ public final class Stun extends AbstractEffect
final L2Character effector = info.getEffector();
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doSummonAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
}
else
{
((L2Summon) effected).doSummonAttack(effector);
}
}
else
{

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else

View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{
if ((effector != null) && !effector.isDead())
{
((L2Summon) effected).doAutoAttack(effector);
if (effector.isPlayable() && (effected.getActingPlayer().getPvpFlag() == 0))
{
effected.disableCoreAI(false);
}
else
{
((L2Summon) effected).doAutoAttack(effector);
}
}
else
{
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer());
effected.disableCoreAI(false);
}
}
else