diff options
| author | megamage <none@none> | 2009-04-23 21:44:48 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-23 21:44:48 -0500 |
| commit | bd56af12949ac649fea185e3481d7ca05bb25660 (patch) | |
| tree | d326fabeba071c989d946c70c9842f596cb5141c | |
| parent | 84e9ffb48798f622872a0a5f1e33cd24021b51e0 (diff) | |
| parent | e97ddc5872174467965d81d767b4c54e6a96cd4a (diff) | |
*Merge.
--HG--
branch : trunk
| -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; |