From 867b57bcf6148a4fbd5e49b8dbc2d244a1d166ad Mon Sep 17 00:00:00 2001 From: KayenEQ Date: Fri, 30 Jan 2015 19:21:24 -0500 Subject: [PATCH 1/4] removed debug msg --- zone/aggro.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 01ff20135..645b40137 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -1286,7 +1286,6 @@ 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) From e8553576f7060a9fc8b99d9b6f97ab0d74640ca5 Mon Sep 17 00:00:00 2001 From: KayenEQ Date: Fri, 30 Jan 2015 19:28:16 -0500 Subject: [PATCH 2/4] remove debug --- zone/aggro.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 645b40137..9ba9f6c8f 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -1287,7 +1287,6 @@ 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. resist_check = ResistSpell(spells[spell_id].resisttype, spell_id, caster, false,0,true); - if (resist_check == 100) return true; } From 18fb507f24133d904611e8fe3aa4e1f431a7a03f Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 30 Jan 2015 20:22:55 -0500 Subject: [PATCH 3/4] Tell queue memleak fix --- world/cliententry.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 034b7ef9a..3dfdbf94c 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(); } @@ -310,6 +312,7 @@ void ClientListEntry::ProcessTellQueue() pack->Deflate(); Server()->SendPacket(pack); safe_delete(pack); + safe_delete_array(*it); it = tell_queue.erase(it); } return; From a18cb6f61e3e257557ee41dc11bbf199e86a82df Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Fri, 30 Jan 2015 22:00:39 -0500 Subject: [PATCH 4/4] Another tell_queue leak fix --- world/cliententry.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/world/cliententry.cpp b/world/cliententry.cpp index 3dfdbf94c..5e896dca0 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -236,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(); }