From a92ece58c14db7340a2871fb4a2a55e1b8732034 Mon Sep 17 00:00:00 2001 From: Yogurt Date: Sat, 1 Jun 2019 03:39:46 -0700 Subject: [PATCH] Check for PreventMovement flag in BattleNpcController Fix typos in some effect scripts --- .../actors/chara/ai/controllers/BattleNpcController.cs | 2 +- data/scripts/effects/barrage.lua | 2 +- data/scripts/effects/decoy.lua | 2 +- data/scripts/effects/decoy2.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs b/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs index 7ca4df4a..8f21f8c8 100644 --- a/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs +++ b/FFXIVClassic Map Server/actors/chara/ai/controllers/BattleNpcController.cs @@ -223,7 +223,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.controllers protected virtual void Move() { - if (!owner.aiContainer.CanFollowPath()) + if (!owner.aiContainer.CanFollowPath() || owner.statusEffects.HasStatusEffectsByFlag(StatusEffectFlags.PreventMovement)) { return; } diff --git a/data/scripts/effects/barrage.lua b/data/scripts/effects/barrage.lua index d1ab844f..3ef7300a 100644 --- a/data/scripts/effects/barrage.lua +++ b/data/scripts/effects/barrage.lua @@ -8,6 +8,6 @@ end; function onCommandFinish(effect, owner, skill, actionContainer) --27259: Light Shot if skill.id == 27259 then - defender.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false); + owner.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false); end end; \ No newline at end of file diff --git a/data/scripts/effects/decoy.lua b/data/scripts/effects/decoy.lua index f2ed8729..7c34da9f 100644 --- a/data/scripts/effects/decoy.lua +++ b/data/scripts/effects/decoy.lua @@ -11,7 +11,7 @@ function onPreAction(effect, caster, target, skill, action, actionContainer) action.hitRate = 0.0; action.resistRate = 750; --Remove status and add message - defender.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false); + caster.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false); end end; \ No newline at end of file diff --git a/data/scripts/effects/decoy2.lua b/data/scripts/effects/decoy2.lua index f962798d..44f53ac0 100644 --- a/data/scripts/effects/decoy2.lua +++ b/data/scripts/effects/decoy2.lua @@ -10,7 +10,7 @@ function onPreAction(effect, caster, target, skill, action, actionContainer) action.hitRate = 0.0; action.resistRate = 400; --Remove status and add message - defender.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false); + caster.statusEffects.RemoveStatusEffect(effect, actionContainer, 30331, false); end end; \ No newline at end of file