Merge branch 'master' into aa

This commit is contained in:
Michael Cook (mackal)
2015-06-19 21:44:58 -04:00
7 changed files with 3177 additions and 5841 deletions
+1 -1
View File
@@ -1105,7 +1105,7 @@ void Mob::AI_Process() {
}
#ifdef BOTS
if (IsPet() && GetOwner()->IsBot() && target == GetOwner())
if (IsPet() && GetOwner() && GetOwner()->IsBot() && target == GetOwner())
{
// this blocks all pet attacks against owner..bot pet test (copied above check)
RemoveFromHateList(this);