Added a few checks to resolve dangling pointers involving Mercs. Similar to the AIYellForHelp crash fixed years ago by Rogean.

This commit is contained in:
SecretsOTheP
2013-03-23 10:04:49 -04:00
parent b0b342a020
commit fa18991917
3 changed files with 6 additions and 2 deletions
+2 -1
View File
@@ -188,13 +188,14 @@ bool Client::Process() {
if(linkdead_timer.Check()){
Save();
LeaveGroup();
if (GetMerc())
{
GetMerc()->Save();
if(GetMerc()->GetGroup != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
LeaveGroup();
Raid *myraid = entity_list.GetRaidByClient(this);
if (myraid)
{