From 14402c9c4103d3a9308ef72405015cb4bbd89b75 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 16 Jan 2020 17:44:46 -0500 Subject: [PATCH] Fix unreachable switch statements in console_server_connection.cpp --- common/net/console_server_connection.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/net/console_server_connection.cpp b/common/net/console_server_connection.cpp index 795c73140..aab26d188 100644 --- a/common/net/console_server_connection.cpp +++ b/common/net/console_server_connection.cpp @@ -116,17 +116,21 @@ bool EQ::Net::ConsoleServerConnection::SendChannelMessage(const ServerChannelMes } switch (scm->chan_num) { - if (RuleB(Chat, ServerWideAuction)) { - case 4: { + case 4: { + if (RuleB(Chat, ServerWideAuction)) { QueueMessage(fmt::format("{0} auctions, '{1}'", scm->from, scm->message)); break; + } else { // I think we want default action in this case? + return false; } } - if (RuleB(Chat, ServerWideOOC)) { - case 5: { + case 5: { + if (RuleB(Chat, ServerWideOOC)) { QueueMessage(fmt::format("{0} says ooc, '{1}'", scm->from, scm->message)); break; + } else { // I think we want default action in this case? + return false; } }