diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp | 2 | ||||
| -rw-r--r-- | src/game/Creature.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp index ce09bbc2cd0..a91c67c9c0d 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp @@ -71,7 +71,7 @@ EndScriptData */ #define SPELL_KNOCKAWAY 10101 #define SPELL_PUMMEL 15615 -#define SPELL_SHOOT 20463 +#define SPELL_SHOOT 16496 //#define SPELL_SUMMONCRIMSONRIFLEMAN 17279 struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 9c27996931d..5b3f45b66dd 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1573,7 +1573,8 @@ bool Creature::IsWithinSightDist(Unit const* u) const bool Creature::canStartAttack(Unit const* who) const { - if(!who->isInAccessiblePlaceFor(this) + if(isCivilian() + || !who->isInAccessiblePlaceFor(this) || !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE || !IsWithinDistInMap(who, GetAttackDistance(who))) return false; |