Merge remote-tracking branch 'origin/master' into eqstream

This commit is contained in:
KimLS
2017-02-25 15:31:40 -08:00
25 changed files with 11829 additions and 3046 deletions
+1 -1
View File
@@ -1564,7 +1564,7 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Sk
}
}
entity_list.RemoveFromTargets(this);
entity_list.RemoveFromTargets(this, true);
hate_list.RemoveEntFromHateList(this);
RemoveAutoXTargets();