josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-23 21:44:48 -05:00
parent 84e9ffb487 e97ddc5872
commit bd56af1294
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/stratholme/boss_cannon_master_willey.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ EndScriptData */
#define SPELL_KNOCKAWAY 10101 #define SPELL_KNOCKAWAY 10101
#define SPELL_PUMMEL 15615 #define SPELL_PUMMEL 15615
#define SPELL_SHOOT 20463 #define SPELL_SHOOT 16496
//#define SPELL_SUMMONCRIMSONRIFLEMAN 17279 //#define SPELL_SUMMONCRIMSONRIFLEMAN 17279
struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI
src/game/Creature.cpp
+2 -1
View File
@@ -1573,7 +1573,8 @@ bool Creature::IsWithinSightDist(Unit const* u) const
bool Creature::canStartAttack(Unit const* who) const bool Creature::canStartAttack(Unit const* who) const
{ {
if(!who->isInAccessiblePlaceFor(this) if(isCivilian()
|| !who->isInAccessiblePlaceFor(this)
|| !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE || !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE
|| !IsWithinDistInMap(who, GetAttackDistance(who))) || !IsWithinDistInMap(who, GetAttackDistance(who)))
return false; return false;