pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-20 13:48:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #41 from SecretsOTheP/master

Browse Source 
Merc Group Crash Fix
This commit is contained in:
JJ
2013-03-24 11:56:06 -07:00
parent e2b9efaf49 e0b05e573e
commit 24d4eaf65d
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client_packet.cpp
-1
View File
@@ -6689,7 +6689,6 @@ void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app)
} }
} }
else if(memberToDisband->IsMerc()) { else if(memberToDisband->IsMerc()) {
Merc::RemoveMercFromGroup(memberToDisband->CastToMerc(), group);
memberToDisband->CastToMerc()->Suspend(); memberToDisband->CastToMerc()->Suspend();
} }
} }
zone/client_process.cpp
-8
View File
@@ -191,8 +191,6 @@ bool Client::Process() {
if (GetMerc()) if (GetMerc())
{ {
GetMerc()->Save(); GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop(); GetMerc()->Depop();
} }
LeaveGroup(); LeaveGroup();
@@ -210,8 +208,6 @@ bool Client::Process() {
if (GetMerc()) if (GetMerc())
{ {
GetMerc()->Save(); GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop(); GetMerc()->Depop();
} }
instalog = true; instalog = true;
@@ -680,8 +676,6 @@ bool Client::Process() {
if (GetMerc()) if (GetMerc())
{ {
GetMerc()->Save(); GetMerc()->Save();
if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop(); GetMerc()->Depop();
} }
return false; return false;
@@ -730,8 +724,6 @@ bool Client::Process() {
} }
if (GetMerc()) if (GetMerc())
{ {
if(GetMerc()->GetGroup() != NULL)
Merc::RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop(); GetMerc()->Depop();
} }
adverrorinfo = 811; adverrorinfo = 811;