From 2ba3e86a1d617b2b3096f62f35e451b140604ffe Mon Sep 17 00:00:00 2001 From: iamgoofball Date: Wed, 17 Oct 2018 17:19:52 -0700 Subject: [PATCH] Adds reason support for kicks and bans to the client. --- packet_distribution.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/packet_distribution.cpp b/packet_distribution.cpp index 6f29b2e..cb48651 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -539,25 +539,23 @@ void AOApplication::server_packet_received(AOPacket *p_packet) } else if (header == "KK") { - if (courtroom_constructed && f_contents.size() > 0) + if (courtroom_constructed && f_contents.size() >= 1) { - int f_cid = w_courtroom->get_cid(); - int remote_cid = f_contents.at(0).toInt(); - - if (f_cid != remote_cid && remote_cid != -1) - goto end; - - call_notice("You have been kicked."); + call_notice("You have been kicked from the server.\nReason: " + f_contents.at(0)); + construct_lobby(); + destruct_courtroom(); + } + } + else if (header == "KB") + { + if (courtroom_constructed && f_contents.size() >= 1) + { + call_notice("You have been banned from the server.\nReason: " + f_contents.at(0)); construct_lobby(); destruct_courtroom(); } } - else if (header == "KB") - { - if (courtroom_constructed && f_contents.size() > 0) - w_courtroom->set_ban(f_contents.at(0).toInt()); - } else if (header == "BD") { call_notice("You are banned on this server.");