pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-11 19:32:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source
This commit is contained in:
Akkadius 2015-01-30 22:58:52 -06:00
commit 62197d7d33
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
world/cliententry.cpp
View File

@ -93,6 +93,8 @@ ClientListEntry::~ClientListEntry() {
Camp(); // updates zoneserver's numplayers Camp(); // updates zoneserver's numplayers
client_list.RemoveCLEReferances(this); client_list.RemoveCLEReferances(this);
} }
for (auto &elem : tell_queue)
safe_delete_array(elem);
tell_queue.clear(); tell_queue.clear();
} }
@ -234,6 +236,8 @@ void ClientListEntry::ClearVars(bool iAll) {
pLFG = 0; pLFG = 0;
gm = 0; gm = 0;
pClientVersion = 0; pClientVersion = 0;
for (auto &elem : tell_queue)
safe_delete_array(elem);
tell_queue.clear(); tell_queue.clear();
} }
@ -310,6 +314,7 @@ void ClientListEntry::ProcessTellQueue()
pack->Deflate(); pack->Deflate();
Server()->SendPacket(pack); Server()->SendPacket(pack);
safe_delete(pack); safe_delete(pack);
safe_delete_array(*it);
it = tell_queue.erase(it); it = tell_queue.erase(it);
} }
return; return;

2
zone/aggro.cpp
View File

@ -1286,9 +1286,7 @@ bool Mob::PassCharismaCheck(Mob* caster, uint16 spell_id) {
{ {
// Assume this is a harmony/pacify spell // Assume this is a harmony/pacify spell
// If 'Lull' spell resists, do a second resist check with a charisma modifier AND regular resist checks. If resists agian you gain aggro. // If 'Lull' spell resists, do a second resist check with a charisma modifier AND regular resist checks. If resists agian you gain aggro.
Shout("DO CHARISM CHECK ON FAIL");
resist_check = ResistSpell(spells[spell_id].resisttype, spell_id, caster, false,0,true); resist_check = ResistSpell(spells[spell_id].resisttype, spell_id, caster, false,0,true);
if (resist_check == 100) if (resist_check == 100)
return true; return true;
} }