diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 034b7ef9a..5e896dca0 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -93,6 +93,8 @@ ClientListEntry::~ClientListEntry() { Camp(); // updates zoneserver's numplayers client_list.RemoveCLEReferances(this); } + for (auto &elem : tell_queue) + safe_delete_array(elem); tell_queue.clear(); } @@ -234,6 +236,8 @@ void ClientListEntry::ClearVars(bool iAll) { pLFG = 0; gm = 0; pClientVersion = 0; + for (auto &elem : tell_queue) + safe_delete_array(elem); tell_queue.clear(); } @@ -310,6 +314,7 @@ void ClientListEntry::ProcessTellQueue() pack->Deflate(); Server()->SendPacket(pack); safe_delete(pack); + safe_delete_array(*it); it = tell_queue.erase(it); } return; diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 01ff20135..9ba9f6c8f 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -1286,9 +1286,7 @@ bool Mob::PassCharismaCheck(Mob* caster, uint16 spell_id) { { // 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. - Shout("DO CHARISM CHECK ON FAIL"); resist_check = ResistSpell(spells[spell_id].resisttype, spell_id, caster, false,0,true); - if (resist_check == 100) return true; }