From 29a36008d1bb0a11c414fe321d50413cf873d42c Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 2 Nov 2014 22:37:16 -0600 Subject: [PATCH] Tell queue sanity checks --- world/zoneserver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index d61d6e65b..96a78b1dd 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -455,7 +455,7 @@ bool ZoneServer::Process() { (cle->TellsOff() && ((cle->Anon() == 1 && scm->fromadmin < cle->Admin()) || scm->fromadmin < 80))) { if (!scm->noreply) { ClientListEntry* sender = client_list.FindCharacter(scm->from); - if (!sender) + if (!sender || !sender->Server()) break; scm->noreply = true; scm->queued = 3; // offline @@ -467,7 +467,7 @@ bool ZoneServer::Process() { if (!scm->noreply) { ClientListEntry* sender = client_list.FindCharacter(scm->from); if (cle->TellQueueFull()) { - if (!sender) + if (!sender || !sender->Server()) break; scm->noreply = true; scm->queued = 2; // queue full @@ -481,7 +481,7 @@ bool ZoneServer::Process() { temp->noreply = true; cle->PushToTellQueue(temp); // deallocation is handled in processing or deconstructor - if (!sender) + if (!sender || !sender->Server()) break; scm->noreply = true; scm->queued = 1; // queued