Merc group/depop crash fixes.

This commit is contained in:
SecretsOTheP
2013-03-24 14:31:03 -04:00
parent e2b9efaf49
commit e0b05e573e
2 changed files with 0 additions and 9 deletions
-8
View File
@@ -191,8 +191,6 @@ bool Client::Process() {
if (GetMerc())
{
GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
LeaveGroup();
@@ -210,8 +208,6 @@ bool Client::Process() {
if (GetMerc())
{
GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
instalog = true;
@@ -680,8 +676,6 @@ bool Client::Process() {
if (GetMerc())
{
GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
return false;
@@ -730,8 +724,6 @@ bool Client::Process() {
}
if (GetMerc())
{
if(GetMerc()->GetGroup() != NULL)
Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop();
}
adverrorinfo = 811;