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

Non monster NPCs should not get in combat.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-03-31 18:41:23 +00:00
parent 36457c0bec
commit 16d00294b8
11 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }

8
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -599,6 +599,12 @@ public abstract class AbstractAI implements Ctrl
*/ */
public void clientStartAutoAttack() public void clientStartAutoAttack()
{ {
// Non monster NPCs should not get in combat.
if (_actor.isNpc() && !_actor.isMonster())
{
return;
}
if (_actor.isSummon()) if (_actor.isSummon())
{ {
final Summon summon = (Summon) _actor; final Summon summon = (Summon) _actor;
@@ -608,6 +614,7 @@ public abstract class AbstractAI implements Ctrl
} }
return; return;
} }
if (!_clientAutoAttacking) if (!_clientAutoAttacking)
{ {
if (_actor.isPlayer() && _actor.hasSummon()) if (_actor.isPlayer() && _actor.hasSummon())
@@ -623,6 +630,7 @@ public abstract class AbstractAI implements Ctrl
_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId())); _actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
setAutoAttacking(true); setAutoAttacking(true);
} }
AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor); AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
} }