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

*Fix the bug that neutural npc aggro players.

Browse Source 
*Fix build.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-25 18:46:07 -05:00
parent ec4031be35
commit 94e25701ad
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Creature.cpp
+1 -1
View File
@@ -1573,7 +1573,7 @@ bool Creature::IsWithinSightDist(Unit const* u) const
bool Creature::canStartAttack(Unit const* who) const bool Creature::canStartAttack(Unit const* who) const
{ {
if(isCivilian() if(isCivilian() || IsNeutralToAll()
|| !who->isInAccessiblePlaceFor(this) || !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)))
src/game/SpellMgr.cpp
+1 -1
View File
@@ -1222,7 +1222,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
// Item cast can trigger only with spells with spellfamily // Item cast can trigger only with spells with spellfamily
if (procExtra & PROC_EX_INTERNAL_ITEM_CAST) if (procExtra & PROC_EX_INTERNAL_ITEM_CAST)
{ {
if (!spellProcEvent->SpellFamilyName) if (!spellProcEvent->spellFamilyName)
return false; return false;
} }
// Check (if set) for school // Check (if set) for school