pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Syntax error, better place for entity list removal

Browse Source
This commit is contained in:
SecretsOTheP 2013-03-23 10:13:29 -04:00
parent 18e9714273
commit a6f2c1be8a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client_process.cpp
View File

@ -191,7 +191,7 @@ bool Client::Process() {
if (GetMerc()) if (GetMerc())
{ {
GetMerc()->Save(); GetMerc()->Save();
if(GetMerc()->GetGroup != NULL) if(GetMerc()->GetGroup() != NULL)
GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup()); GetMerc()->RemoveMercFromGroup(GetMerc(), GetMerc()->GetGroup());
GetMerc()->Depop(); GetMerc()->Depop();
} }

5
zone/merc.cpp
View File

@ -4915,8 +4915,6 @@ void Merc::Death(Mob* killerMob, int32 damage, uint16 spell, SkillType attack_sk
if(entity_list.GetCorpseByID(GetID())) if(entity_list.GetCorpseByID(GetID()))
entity_list.GetCorpseByID(GetID())->Depop(); entity_list.GetCorpseByID(GetID())->Depop();
entity_list.RemoveMerc(GetID());
if(Suspend()) if(Suspend())
{ {
} }
@ -5775,13 +5773,12 @@ bool Merc::Dismiss(){
void Merc::Zone() { void Merc::Zone() {
Save(); Save();
entity_list.RemoveMerc(this->GetID());
Depop(); Depop();
} }
void Merc::Depop() { void Merc::Depop() {
WipeHateList(); WipeHateList();
entity_list.RemoveMerc(this->GetID());
entity_list.RemoveFromHateLists(this); entity_list.RemoveFromHateLists(this);
if(HasGroup()) if(HasGroup())