From 57fa096ae7fee4ee4698bc7a681796938c4ae3c4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 31 Mar 2019 19:05:48 +0000 Subject: [PATCH] Previous change should check for all non attackables. --- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- .../java/com/l2jmobius/gameserver/ai/AbstractAI.java | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/ai/AbstractAI.java index 7a9fe10ac0..f332822d7b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/ai/AbstractAI.java @@ -599,8 +599,8 @@ public abstract class AbstractAI implements Ctrl */ public void clientStartAutoAttack() { - // Non monster NPCs should not get in combat. - if (_actor.isNpc() && !_actor.isMonster()) + // Non attackable NPCs should not get in combat. + if (_actor.isNpc() && !_actor.isAttackable()) { return; }