*Merge.

--HG--
branch : trunk

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

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;