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

Summons should not PvP flag after getting stunned.

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

11
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Stun.java vendored
View File

@@ -59,7 +59,14 @@ public final class Stun extends AbstractEffect
final L2Character effector = info.getEffector(); final L2Character effector = info.getEffector();
if ((effector != null) && !effector.isDead()) 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 else
{ {

11
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else

11
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@@ -73,11 +73,18 @@ public final class BlockActions extends AbstractEffect
{ {
if ((effector != null) && !effector.isDead()) 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 else
{ {
effected.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, effected.getActingPlayer()); effected.disableCoreAI(false);
} }
} }
else else