From fb40f1895b72f827dc1f333b56d2043f94f8ee5d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 15 Sep 2022 08:50:08 +0000 Subject: [PATCH] Re-enable AI on decay. --- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- .../l2jmobius/gameserver/model/actor/Creature.java | 11 +++++++---- 27 files changed, 189 insertions(+), 108 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 24419c662c..9e40544962 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4982,12 +4985,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 24419c662c..9e40544962 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4982,12 +4985,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index 24419c662c..9e40544962 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4982,12 +4985,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index 24419c662c..9e40544962 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4982,12 +4985,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index c10259ac0a..f18b60cf85 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4991,12 +4994,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index c10259ac0a..f18b60cf85 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4991,12 +4994,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index c10259ac0a..f18b60cf85 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4991,12 +4994,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6b3e6c3834..4f94704ab3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4379,7 +4382,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4990,12 +4993,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index a54ec12cef..4d0157f0af 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4379,7 +4382,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4990,12 +4993,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index a54ec12cef..4d0157f0af 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4379,7 +4382,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4990,12 +4993,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java index 12f68d6195..ec717573a5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -600,6 +600,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2040,7 +2043,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4389,7 +4392,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5000,12 +5003,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index c45b557421..b142ca89c3 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2413,6 +2413,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe getAI().stopAITask(); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2645,7 +2648,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); } public Calculator[] getCalculators() @@ -5805,7 +5808,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _castInterruptTime = newSkillCastEndTick - 4; } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; public void updatePvPFlag(int value) { @@ -6187,12 +6190,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** 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 4a58175650..1dfab2e8df 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 @@ -2567,6 +2567,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe getAI().stopAITask(); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2799,7 +2802,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); } public Calculator[] getCalculators() @@ -6035,7 +6038,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _castInterruptTime = newSkillCastEndTick - 4; } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; public void updatePvPFlag(int value) { @@ -6418,12 +6421,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** 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 fd3fafaf41..60c376b00c 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 @@ -2569,6 +2569,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe getAI().stopAITask(); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2801,7 +2804,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || isStunned() || isSleeping() || isParalyzed(); } public Calculator[] getCalculators() @@ -6037,7 +6040,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _castInterruptTime = newSkillCastEndTick - 4; } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; public void updatePvPFlag(int value) { @@ -6420,12 +6423,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3de00e599d..6970be84ff 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4975,12 +4978,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3de00e599d..6970be84ff 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4975,12 +4978,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** 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 3de00e599d..6970be84ff 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 @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4975,12 +4978,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 3de00e599d..6970be84ff 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4975,12 +4978,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index bc221bace5..41f585c24b 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4984,12 +4987,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index bf7d343446..65ee8bcc9b 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -591,6 +591,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2031,7 +2034,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4393,7 +4396,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5009,12 +5012,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index ba1ac8c573..a89b3874cf 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -591,6 +591,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2031,7 +2034,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4393,7 +4396,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5009,12 +5012,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index bf7d343446..65ee8bcc9b 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -591,6 +591,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2031,7 +2034,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4393,7 +4396,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5009,12 +5012,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** 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 e59ba26696..2f75f2d546 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 @@ -591,6 +591,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2031,7 +2034,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4392,7 +4395,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5008,12 +5011,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** 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 3de00e599d..6970be84ff 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 @@ -590,6 +590,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2030,7 +2033,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4380,7 +4383,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -4975,12 +4978,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index 58161cbc2f..e5993d1a35 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -591,6 +591,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2034,7 +2037,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4405,7 +4408,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5021,12 +5024,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** 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 745bbb59e8..771560cd17 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 @@ -591,6 +591,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2041,7 +2044,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4412,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5028,12 +5031,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /** diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java index e00430814b..f2a395d96c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -601,6 +601,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe _summoner.removeSummonedNpc(getObjectId()); } + // Enable AI. + _disabledAI = false; + _onCreatureAttack = null; _onCreatureAttacked = null; _onCreatureDamageDealt = null; @@ -2051,7 +2054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe */ public boolean isDisabled() { - return _AIdisabled || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); + return _disabledAI || isAlikeDead() || isPhysicalAttackMuted() || hasBlockActions(); } public boolean isConfused() @@ -4432,7 +4435,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(transform -> transform.getLevelMod(this)).orElse(defaultLevelMod); } - private boolean _AIdisabled = false; + private boolean _disabledAI = false; /** * Dummy value that gets overriden in Playable. @@ -5048,12 +5051,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public void disableCoreAI(boolean value) { - _AIdisabled = value; + _disabledAI = value; } public boolean isCoreAIDisabled() { - return _AIdisabled; + return _disabledAI; } /**