Non monster NPCs should not get in combat.

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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