From 786428b047b5ea0ce3797bfc7127ed293b3458ae Mon Sep 17 00:00:00 2001
From: Anubisss <none@none>
Date: Thu, 23 Apr 2009 17:33:02 +0200
Subject: *Fix a typo in Cannon Master Willey's script by Thraxx. Thank you.

--HG--
branch : trunk
---
 .../scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 08b754177bb..9fc9194ca4b 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
-- 
cgit v1.2.3


From e97ddc5872174467965d81d767b4c54e6a96cd4a Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 23 Apr 2009 21:38:50 -0500
Subject: *Do not let civilian aggro players.

--HG--
branch : trunk
---
 src/game/Creature.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index e7572bf5e78..520e5cb62c3 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1563,7 +1563,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;
-- 
cgit v1.2.3