aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLeifa <26681464+TrickyLeifa@users.noreply.github.com>2024-07-14 16:25:25 +0200
committerGitHub <noreply@github.com>2024-07-14 16:25:25 +0200
commit640b026534db21b854df83367f2815b857aaa76a (patch)
treefe9a2832d81e2539843593cf3a6d2f0118d62b2f /src
parent23077d0291426037b6b120cf765664b4487c9330 (diff)
Playerlist fix (#1018)
* Commit * Boyfailure code commit * Cooking code spaghetti * Accidental overwrite recursive function call hell * Implemented player list * Add partial moderator widget Sleepy time! Hee-Hoo! * Moderator Dialog - Step 1 - WIP * Appease the clang gods * Clang appeasement policy * *sacrifices goat to clang* * Added player report, reworked implementation, ... * Added player-specific report * Reworked implementation * No longer uses JSON. * Removed preset loader. * Remove unused code. * Safety measures against potential segfault. * Removes unused code --------- Co-authored-by: Salanto <62221668+Salanto@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/packet_distribution.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 677b3fdb..9ec6fd01 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -7,10 +7,6 @@
#include "networkmanager.h"
#include "options.h"
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-
void AOApplication::append_to_demofile(QString packet_string)
{
if (Options::getInstance().logToDemoFileEnabled() && !log_filename.isEmpty())
@@ -42,16 +38,6 @@ void AOApplication::server_packet_received(AOPacket packet)
}
#endif
- auto convert_to_json = [](QString data) -> QJsonDocument {
- QJsonParseError error;
- QJsonDocument document = QJsonDocument::fromJson(data.toUtf8(), &error);
- if (error.error != QJsonParseError::NoError)
- {
- qWarning().noquote() << "Invalid or malformed JSON data:" << error.errorString();
- }
- return document;
- };
-
if (header == "decryptor")
{
if (content.size() == 0)
@@ -692,7 +678,7 @@ void AOApplication::server_packet_received(AOPacket packet)
}
else if (header == "PR")
{
- if (content.size() < 2)
+ if (content.size() < 2 || !is_courtroom_constructed())
{
return;
}
@@ -702,7 +688,7 @@ void AOApplication::server_packet_received(AOPacket packet)
}
else if (header == "PU")
{
- if (content.size() < 3)
+ if (content.size() < 3 || !is_courtroom_constructed())
{
return;
}