From cefabb9fe99ee09cafdc2348ec49d387960c704d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 11 Aug 2021 22:08:05 +0000 Subject: [PATCH] Addition of Creature isDisabled method. --- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../game/data/scripts/ai/bosses/QueenAnt.java | 4 +-- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../gameserver/ai/FortSiegeGuardAI.java | 4 +-- .../gameserver/model/actor/Creature.java | 33 ++++++++++--------- .../model/actor/instance/PlayerInstance.java | 2 +- .../clientpackets/RequestActionUse.java | 2 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 4 +-- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../gameserver/ai/FortSiegeGuardAI.java | 4 +-- .../gameserver/model/actor/Creature.java | 33 ++++++++++--------- .../model/actor/instance/PlayerInstance.java | 2 +- .../clientpackets/RequestActionUse.java | 2 +- .../gameserver/ai/FortSiegeGuardAI.java | 4 +-- .../l2jmobius/gameserver/ai/SiegeGuardAI.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/ai/FortSiegeGuardAI.java | 4 +-- .../l2jmobius/gameserver/ai/SiegeGuardAI.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- .../gameserver/model/actor/Creature.java | 16 ++++++--- .../model/actor/instance/PlayerInstance.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 4 +-- 83 files changed, 397 insertions(+), 211 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6ca32e5eb6..880fec2343 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7660d6ce8b..742838f307 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2881,7 +2881,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index d9620add47..f91ffc7a7c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6ca32e5eb6..880fec2343 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 779c43efd1..49ac0a83bf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2887,7 +2887,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index d4ace40cd9..a3071496a5 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index b3c9eb8bca..8f2a735048 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 34c4b24b8a..7a1851338f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2889,7 +2889,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index d4ace40cd9..a3071496a5 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index b3c9eb8bca..8f2a735048 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 50d86bff85..61140720f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2885,7 +2885,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index d4ace40cd9..a3071496a5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index eb0cc6a4d6..f7cfc646ac 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9510031bc5..ba0f97f636 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2881,7 +2881,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 29c3454bbf..b33bc67b01 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index eb0cc6a4d6..f7cfc646ac 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7fe8f5e7c2..0e553ec9c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2881,7 +2881,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 29c3454bbf..b33bc67b01 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index eb0cc6a4d6..f7cfc646ac 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index fa43ec0b78..70d7e41eed 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2882,7 +2882,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 29c3454bbf..b33bc67b01 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1a951a259b..fd075b5d90 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c64abb4a20..b891912ce1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2816,7 +2816,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index ad8d1a79f7..9bea983ec0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5a3f2a2dd6..e084687895 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d5163a1564..2d0845cf55 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2847,7 +2847,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index ad8d1a79f7..9bea983ec0 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5a3f2a2dd6..e084687895 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 690e19f3fe..bea580615a 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2864,7 +2864,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index ad8d1a79f7..9bea983ec0 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5a3f2a2dd6..e084687895 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 690e19f3fe..bea580615a 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2864,7 +2864,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index ad8d1a79f7..9bea983ec0 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java index 6c2ffc6f90..1eed1e2df5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -153,7 +153,7 @@ public class QueenAnt extends Quest _larva = (MonsterInstance) addSpawn(LARVA, -21600, 179482, -5846, Rnd.get(360), false, 0); _larva.setUnkillable(true); _larva.setImmobilized(true); - _larva.setAttackDisabled(true); + _larva.setPhysicalAttackMuted(true); } @Override @@ -188,7 +188,7 @@ public class QueenAnt extends Quest final int x = (int) (radius * Math.cos(i * 1.407)); // 1.407~2pi/6 final int y = (int) (radius * Math.sin(i * 1.407)); _nurses.add((MonsterInstance) addSpawn(NURSE, npc.getX() + x, npc.getY() + y, npc.getZ(), 0, false, 0)); - _nurses.get(i).setAttackDisabled(true); + _nurses.get(i).setPhysicalAttackMuted(true); } break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java index e121c40c33..f27b69da2e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -750,7 +750,7 @@ public class AttackableAI extends CreatureAI } } - if (_actor.isAttackingDisabled()) + if (_actor.isAttackDisabled()) { return; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 7bfd77ba43..789bfba03e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -493,7 +493,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable if (/* _selfAnalysis.hasHealOrResurrect && */(creature instanceof PlayerInstance) && ((NpcInstance) _actor).getFort().getSiege().checkIsDefender(((PlayerInstance) creature).getClan())) { // heal friends - if (!_actor.isAttackingDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) + if (!_actor.isAttackDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) { for (Skill sk : /* _selfAnalysis.healSkills */healSkills) { @@ -554,7 +554,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable } } // heal friends - if (/* _selfAnalysis.hasHealOrResurrect && */ !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (/* _selfAnalysis.hasHealOrResurrect && */ !_actor.isAttackDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { for (Skill sk : /* _selfAnalysis.healSkills */ healSkills) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index cb99cfc14c..59d07c8cad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -180,7 +180,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder protected boolean _isTeleporting = false; protected boolean _isInvul = false; protected boolean _isUnkillable = false; - protected boolean _isAttackDisabled = false; + protected boolean _isPhysicalAttackMuted = false; private int _lastHealAmount = 0; private CreatureStat _stat; private CreatureStatus _status; @@ -752,7 +752,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return; } - if (isAttackingDisabled()) + if (isAttackDisabled()) { return; } @@ -2129,12 +2129,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder } /** - * Return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyse). - * @return true, if is attacking disabled + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return _isImmobileUntilAttacked || _isStunned || _isSleeping || _isFallsdown || (_attackEndTime > GameTimeTaskManager.getGameTicks()) || _isFakeDeath || _isParalyzed || _isAttackDisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _isFakeDeath || _isPhysicalAttackMuted || _isImmobileUntilAttacked || _isStunned || _isSleeping || _isFallsdown || _isParalyzed; } /** @@ -9363,20 +9370,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder _isUnkillable = value; } - /** - * @return the _isAttackDisabled - */ - public boolean isAttackDisabled() + public boolean isPhysicalAttackMuted() { - return _isAttackDisabled; + return _isPhysicalAttackMuted; } - /** - * @param value the _isAttackDisabled to set - */ - public void setAttackDisabled(boolean value) + public void setPhysicalAttackMuted(boolean value) { - _isAttackDisabled = value; + _isPhysicalAttackMuted = value; } /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7328fac502..419e3bdc4a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3081,7 +3081,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isOutOfControl() && !isImmobilized()) + if (!_waitTypeSitting && !isAttackDisabled() && !isOutOfControl() && !isImmobilized()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index c7a8fbce63..d947ea2b0a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -166,7 +166,7 @@ public class RequestActionUse implements IClientIncomingPacket { if ((target != null) && (pet != null) && (pet != target) && !player.isBetrayed()) { - if (pet.isAttackingDisabled()) + if (pet.isAttackDisabled()) { if (pet.getAttackEndTime() > GameTimeTaskManager.getGameTicks()) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java index 6c2ffc6f90..1eed1e2df5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -153,7 +153,7 @@ public class QueenAnt extends Quest _larva = (MonsterInstance) addSpawn(LARVA, -21600, 179482, -5846, Rnd.get(360), false, 0); _larva.setUnkillable(true); _larva.setImmobilized(true); - _larva.setAttackDisabled(true); + _larva.setPhysicalAttackMuted(true); } @Override @@ -188,7 +188,7 @@ public class QueenAnt extends Quest final int x = (int) (radius * Math.cos(i * 1.407)); // 1.407~2pi/6 final int y = (int) (radius * Math.sin(i * 1.407)); _nurses.add((MonsterInstance) addSpawn(NURSE, npc.getX() + x, npc.getY() + y, npc.getZ(), 0, false, 0)); - _nurses.get(i).setAttackDisabled(true); + _nurses.get(i).setPhysicalAttackMuted(true); } break; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index e121c40c33..f27b69da2e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -750,7 +750,7 @@ public class AttackableAI extends CreatureAI } } - if (_actor.isAttackingDisabled()) + if (_actor.isAttackDisabled()) { return; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 7bfd77ba43..789bfba03e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -493,7 +493,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable if (/* _selfAnalysis.hasHealOrResurrect && */(creature instanceof PlayerInstance) && ((NpcInstance) _actor).getFort().getSiege().checkIsDefender(((PlayerInstance) creature).getClan())) { // heal friends - if (!_actor.isAttackingDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) + if (!_actor.isAttackDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) { for (Skill sk : /* _selfAnalysis.healSkills */healSkills) { @@ -554,7 +554,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable } } // heal friends - if (/* _selfAnalysis.hasHealOrResurrect && */ !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (/* _selfAnalysis.hasHealOrResurrect && */ !_actor.isAttackDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { for (Skill sk : /* _selfAnalysis.healSkills */ healSkills) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index c21de5dced..12e8d75d6b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -182,7 +182,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder protected boolean _isTeleporting = false; protected boolean _isInvul = false; protected boolean _isUnkillable = false; - protected boolean _isAttackDisabled = false; + protected boolean _isPhysicalAttackMuted = false; private int _lastHealAmount = 0; private CreatureStat _stat; private CreatureStatus _status; @@ -762,7 +762,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return; } - if (isAttackingDisabled()) + if (isAttackDisabled()) { return; } @@ -2172,12 +2172,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder } /** - * Return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyse). - * @return true, if is attacking disabled + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return _isImmobileUntilAttacked || _isStunned || _isSleeping || _isFallsdown || (_attackEndTime > GameTimeTaskManager.getGameTicks()) || _isFakeDeath || _isParalyzed || _isAttackDisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _isFakeDeath || _isPhysicalAttackMuted || _isImmobileUntilAttacked || _isStunned || _isSleeping || _isFallsdown || _isParalyzed; } /** @@ -9410,20 +9417,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder _isUnkillable = value; } - /** - * @return the _isAttackDisabled - */ - public boolean isAttackDisabled() + public boolean isPhysicalAttackMuted() { - return _isAttackDisabled; + return _isPhysicalAttackMuted; } - /** - * @param value the _isAttackDisabled to set - */ - public void setAttackDisabled(boolean value) + public void setPhysicalAttackMuted(boolean value) { - _isAttackDisabled = value; + _isPhysicalAttackMuted = value; } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index fd317eb83e..bf6de07803 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -3149,7 +3149,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isOutOfControl() && !isImmobilized()) + if (!_waitTypeSitting && !isAttackDisabled() && !isOutOfControl() && !isImmobilized()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 62c34b814d..ec0436f48c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -166,7 +166,7 @@ public class RequestActionUse implements IClientIncomingPacket { if ((target != null) && (pet != null) && (pet != target) && !player.isBetrayed()) { - if (pet.isAttackingDisabled()) + if (pet.isAttackDisabled()) { if (pet.getAttackEndTime() > GameTimeTaskManager.getGameTicks()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 40061faf79..06123018d9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -367,7 +367,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable if (!(creature instanceof Npc)) { if (_selfAnalysis.hasHealOrResurrect && creature.isPlayer() && ((Npc) _actor).getFort().getSiege().checkIsDefender(((PlayerInstance) creature).getClan())// - && !_actor.isAttackingDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) + && !_actor.isAttackDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { @@ -410,7 +410,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable return; } // heal friends - if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index c581c5633f..f10b1f1ae6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -358,7 +358,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable if (!(creature instanceof Npc)) { if (_selfAnalysis.hasHealOrResurrect && creature.isPlayer() && (((Npc) _actor).getCastle().getSiege().checkIsDefender(((PlayerInstance) creature).getClan()))// - && !_actor.isAttackingDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) + && !_actor.isAttackDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { @@ -401,7 +401,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable return; } // heal friends - if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java index 08956116b7..71bf7671a1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -909,7 +909,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || isAttackDisabled() || !target.isTargetable()) { return; } @@ -2670,11 +2670,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return isStunned() || isSleeping() || isAttackingNow() || isAlikeDead() || isParalyzed() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); } public Calculator[] getCalculators() diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f7a2036105..6a9ec71c17 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2918,7 +2918,7 @@ public class PlayerInstance extends Playable return; } - if (_waitTypeSitting || isAttackingDisabled() || isOutOfControl() || isImmobilized()) + if (_waitTypeSitting || isAttackDisabled() || isOutOfControl() || isImmobilized()) { return; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 40061faf79..06123018d9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -367,7 +367,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable if (!(creature instanceof Npc)) { if (_selfAnalysis.hasHealOrResurrect && creature.isPlayer() && ((Npc) _actor).getFort().getSiege().checkIsDefender(((PlayerInstance) creature).getClan())// - && !_actor.isAttackingDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) + && !_actor.isAttackDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { @@ -410,7 +410,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable return; } // heal friends - if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java index c581c5633f..f10b1f1ae6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java @@ -358,7 +358,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable if (!(creature instanceof Npc)) { if (_selfAnalysis.hasHealOrResurrect && creature.isPlayer() && (((Npc) _actor).getCastle().getSiege().checkIsDefender(((PlayerInstance) creature).getClan()))// - && !_actor.isAttackingDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) + && !_actor.isAttackDisabled() && (creature.getCurrentHp() < (creature.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && creature.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { @@ -401,7 +401,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable return; } // heal friends - if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) + if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2)) && npc.isInCombat()) { for (Skill sk : _selfAnalysis.healSkills) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index 48a2745a37..273d2fbea1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -910,7 +910,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || isAttackingDisabled() || !target.isTargetable()) + if ((target == null) || isAttackDisabled() || !target.isTargetable()) { return; } @@ -2672,11 +2672,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return isStunned() || isSleeping() || isAttackingNow() || isAlikeDead() || isParalyzed() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); } public Calculator[] getCalculators() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 472b36a365..3604294ed7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2829,7 +2829,7 @@ public class PlayerInstance extends Playable return; } - if (_waitTypeSitting || isAttackingDisabled() || isOutOfControl() || isImmobilized()) + if (_waitTypeSitting || isAttackDisabled() || isOutOfControl() || isImmobilized()) { return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8ed8ef9f6f..0f95c6d50b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7b158c2deb..eee634198a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2847,7 +2847,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bd2bfe8a44..a4b561ab84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8ed8ef9f6f..0f95c6d50b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 9ea750f5cb..a099dcb337 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2847,7 +2847,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bd2bfe8a44..a4b561ab84 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 9cb35298f0..f608c08020 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b12051e0dc..6dfb9bf0dd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2845,7 +2845,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bd2bfe8a44..a4b561ab84 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 0fc8560378..42b639aab1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -952,7 +952,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1929,11 +1929,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 55b6f3fbcf..9496a306fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2857,7 +2857,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bd2bfe8a44..a4b561ab84 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 0fc8560378..42b639aab1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -952,7 +952,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1929,11 +1929,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ae1159d4f6..fe5ba5e4ef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2857,7 +2857,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bd2bfe8a44..a4b561ab84 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index ad69ca6e69..a167f0e916 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -952,7 +952,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1929,11 +1929,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index abfbaf0944..25af3350f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2781,7 +2781,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index ca8b2c2fb5..78079e44ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -553,8 +553,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8ed8ef9f6f..0f95c6d50b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -951,7 +951,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1928,11 +1928,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 28f0cc6bb7..21202e0900 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2844,7 +2844,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bd2bfe8a44..a4b561ab84 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -548,8 +548,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index ca7a9249c0..beab91e3f9 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -955,7 +955,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1932,11 +1932,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index dda9176675..011a22fb7f 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2851,7 +2851,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 2edc531fd9..2e209f6999 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -553,8 +553,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java index 91743dece7..b9f26f537d 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -955,7 +955,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1939,11 +1939,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ca031e3f93..7f5bc20794 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2892,7 +2892,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 2edc531fd9..2e209f6999 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -553,8 +553,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java index 91743dece7..b9f26f537d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -955,7 +955,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } try { - if ((target == null) || (isAttackingDisabled() && !isSummon()) || !target.isTargetable()) + if ((target == null) || (isAttackDisabled() && !isSummon()) || !target.isTargetable()) { return; } @@ -1939,11 +1939,19 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe } /** - * @return True if the Creature can't attack (stun, sleep, attackEndTime, fakeDeath, paralyze, attackMute). + * @return True if the Creature can't attack (attackEndTime, attackMute, fake death, stun, sleep, paralyze). */ - public boolean isAttackingDisabled() + public boolean isAttackDisabled() { - return hasBlockActions() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || _AIdisabled; + return isAttackingNow() || isDisabled(); + } + + /** + * @return True if the Creature is disabled (attackMute, fake death, stun, sleep, paralyze). + */ + public boolean isDisabled() + { + return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ca031e3f93..7f5bc20794 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2892,7 +2892,7 @@ public class PlayerInstance extends Playable return; } - if (!_waitTypeSitting && !isAttackingDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) + if (!_waitTypeSitting && !isAttackDisabled() && !isControlBlocked() && !isImmobilized() && !isFishing()) { breakAttack(); setSitting(true); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 2edc531fd9..2e209f6999 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -553,8 +553,8 @@ public class SkillCaster implements Runnable // Launch the magic skill in order to calculate its effects try { - // Mobius: Disabled characters should not be able to finish bad skills. - if (caster.isAttackingDisabled() && skill.isBad()) + // Disabled characters should not be able to finish bad skills. + if (skill.isBad() && caster.isDisabled()) { return; }