Merge branch 'master' into water_map_v2

This commit is contained in:
KimLS
2014-05-23 16:09:46 -07:00
10 changed files with 55 additions and 44 deletions
+1 -1
View File
@@ -163,7 +163,7 @@ Mob* HateList::GetClosest(Mob *hater) {
++iterator;
}
if (close == 0 && hater->IsNPC())
if (close == 0 && hater->IsNPC() || close->DivineAura())
close = hater->CastToNPC()->GetHateTop();
return close;