From 3e119783ca5004d94390c6fa4872e3e76bd870ae Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Sat, 6 Apr 2024 08:20:33 -0500
Subject: [PATCH] Fix CPU core maxing out, esp. on Linux and bump version for
 hotfix (#350)

* fix CPU usage spike

* remove accidentally included change from other branch
---
 akashi/main.cpp        | 2 +-
 core/src/area_data.cpp | 1 +
 core/src/server.cpp    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/akashi/main.cpp b/akashi/main.cpp
index bf8adf0..f94091a 100644
--- a/akashi/main.cpp
+++ b/akashi/main.cpp
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
     QCoreApplication::setApplicationName("akashi");
-    QCoreApplication::setApplicationVersion("honeydew (1.8)");
+    QCoreApplication::setApplicationVersion("honeydew hotfix (1.8.1)");
     std::atexit(cleanup);
 
     // Verify server configuration is sound.
diff --git a/core/src/area_data.cpp b/core/src/area_data.cpp
index 03cb1ec..a0d9c73 100644
--- a/core/src/area_data.cpp
+++ b/core/src/area_data.cpp
@@ -326,6 +326,7 @@ bool AreaData::isShoutAllowed() const
 void AreaData::startMessageFloodguard(int f_duration)
 {
     m_can_send_ic_messages = false;
+    m_message_floodguard_timer->setSingleShot(true);
     m_message_floodguard_timer->start(f_duration);
 }
 
diff --git a/core/src/server.cpp b/core/src/server.cpp
index cb075ba..8074495 100644
--- a/core/src/server.cpp
+++ b/core/src/server.cpp
@@ -144,6 +144,7 @@ void Server::start()
 
     // Rate-Limiter for IC-Chat
     m_message_floodguard_timer = new QTimer(this);
+    m_message_floodguard_timer->setSingleShot(true);
     connect(m_message_floodguard_timer, &QTimer::timeout, this, &Server::allowMessage);
 
     // Prepare player IDs and reference hash.