Add Lua function to get a player's role (#366 )

Adds `MP.GetPlayerRole(player_id)` to the Lua API to get a player's role ("USER", "EA", "MDEV", "STAFF", "ET") by their player id. Currently you can only get someone's role in onPlayerAuth from the parameters and in onVehicleSpawned and onVehicleEdited from the packet data, but not in onPlayerJoin for example without storing it.
bump version
2026-02-16 10:41:01 +00:00 · 2024-10-05 16:09:37 +02:00 · 2024-10-05 16:09:02 +02:00 · 2024-10-05 16:07:53 +02:00 · 2024-10-05 16:07:27 +02:00 · 2024-10-04 23:29:11 +02:00
49 changed files with 1458 additions and 635 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -26,7 +26,7 @@ jobs:
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 20.04
+            version: 24.04
    container:
      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
@@ -63,13 +63,13 @@ jobs:
        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.x86_64
          path: ./bin/BeamMP-Server

      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.x86_64
          path: ./bin/BeamMP-Server.debug
@@ -97,7 +97,7 @@ jobs:
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 20.04
+            version: 24.04
    container:
      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
@@ -134,13 +134,13 @@ jobs:
        run: bash ./scripts/${{ matrix.distro }}-${{ matrix.version }}/3-build.sh

      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: BeamMP-Server.${{ matrix.distro }}.${{ matrix.version }}.arm64
          path: ./bin/BeamMP-Server

      - name: Archive server debug info artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: debuginfo.${{ matrix.distro }}.${{ matrix.version }}.arm64
          path: ./bin/BeamMP-Server.debug
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 20.04
+            version: 24.04
    container:
      image: ${{ matrix.distro }}:${{ matrix.version }}
    steps:
@@ -116,7 +116,7 @@ jobs:
          - distro: ubuntu
            version: 22.04
          - distro: ubuntu
-            version: 20.04
+            version: 24.04
    env:
      VCPKG_DEFAULT_TRIPLET: "arm64-linux"
      VCPKG_FORCE_SYSTEM_BINARIES: 1
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -41,7 +41,7 @@ jobs:
        run: bash ./scripts/windows/2-build.sh

      - name: Archive server artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
        with:
          name: BeamMP-Server-windows
          path: ./bin/Release/BeamMP-Server.exe
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/Microsoft/vcpkg.git
+[submodule "deps/toml11"]
+	path = deps/toml11
+	url = https://github.com/ToruNiina/toml11
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ include(cmake/Git.cmake)
 ### SETTINGS ###

 # add all headers (.h, .hpp) to this
-set(PRJ_HEADERS 
+set(PRJ_HEADERS
    include/ArgsParser.h
    include/BoostAliases.h
    include/Client.h
@@ -49,7 +49,9 @@ set(PRJ_HEADERS
    include/TServer.h
    include/VehicleData.h
    include/Env.h
+    include/Settings.h
    include/Profiling.h
+    include/ChronoWrapper.h
 )
 # add all source files (.cpp) to this, except the one with main()
 set(PRJ_SOURCES
@@ -73,7 +75,9 @@ set(PRJ_SOURCES
    src/TServer.cpp
    src/VehicleData.cpp
    src/Env.cpp
+    src/Settings.cpp
    src/Profiling.cpp
+    src/ChronoWrapper.cpp
 )

 find_package(Lua REQUIRED)
@@ -89,7 +93,7 @@ set(PRJ_COMPILE_FEATURES cxx_std_20)
 # set #defines (test enable/disable not included here)
 set(PRJ_DEFINITIONS CPPHTTPLIB_OPENSSL_SUPPORT)
 # add all libraries used by the project (WARNING: also set them in vcpkg.json!)
-set(PRJ_LIBRARIES 
+set(PRJ_LIBRARIES
    fmt::fmt
    doctest::doctest
    Threads::Threads
@@ -112,7 +116,7 @@ find_package(httplib CONFIG REQUIRED)
 find_package(libzip CONFIG REQUIRED)
 find_package(RapidJSON CONFIG REQUIRED)
 find_package(sol2 CONFIG REQUIRED)
-find_package(toml11 CONFIG REQUIRED)
+add_subdirectory("deps/toml11")

 include_directories(include)

@@ -121,7 +125,7 @@ include(FindThreads)

 ### END SETTINGS ###

-# DONT change anything beyond this point unless you've read the cmake bible and 
+# DONT change anything beyond this point unless you've read the cmake bible and
 # swore on it not to bonk up the ci/cd pipelines with your changes.

 ####################
@@ -160,7 +164,7 @@ set(PRJ_DEFINITIONS ${PRJ_DEFINITIONS}
 )

 # build commandline manually for funky windows flags to carry over without a custom toolchain file
-add_library(commandline_static 
+add_library(commandline_static
    deps/commandline/src/impls.h
    deps/commandline/src/windows_impl.cpp
    deps/commandline/src/linux_impl.cpp
@@ -173,6 +177,11 @@ add_library(commandline_static
    deps/commandline/src/backends/BufferedBackend.cpp
    deps/commandline/src/backends/BufferedBackend.h
 )
+
+# Ensure the commandline library uses C++11
+set_target_properties(commandline_static PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES)
+
+
 if (WIN32)
    target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1)
 else ()
@@ -216,4 +225,3 @@ if(${PROJECT_NAME}_ENABLE_UNIT_TESTING)
        target_link_options(${PROJECT_NAME}-tests PRIVATE "/SUBSYSTEM:CONSOLE")
    endif(MSVC)
 endif()
-
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Feel free to ask any questions via the following channels:

 These values are guesstimated and are subject to change with each release.

-* RAM: 50+ MiB usable (not counting OS overhead)
+* RAM: 30-100 MiB usable (not counting OS overhead)
 * CPU: >1GHz, preferably multicore
 * OS: Windows, Linux (theoretically any POSIX)
 * GPU: None
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@@ -3,9 +3,9 @@
 # https://github.com/lefticus/cppbestpractices/blob/master/02-Use_the_Tools_Available.md
 # Courtesy of Jason Turner
 # License here: https://github.com/cpp-best-practices/cppbestpractices/blob/master/LICENSE
-# 
+#
 # This version has been modified by the owners of the current respository.
-# Modifications have mostly been marked with "modified" or similar, though this is not 
+# Modifications have mostly been marked with "modified" or similar, though this is not
 # strictly required.

 function(set_project_warnings project_name)
@@ -73,7 +73,6 @@ function(set_project_warnings project_name)
            -Werror=missing-declarations
            -Werror=missing-field-initializers
            -Werror=ctor-dtor-privacy
-            -Werror=switch-enum
            -Wswitch-default
            -Werror=unused-result
            -Werror=implicit-fallthrough
--- a/cmake/Git.cmake
+++ b/cmake/Git.cmake
@@ -2,7 +2,7 @@ find_package(Git)
 if(${PROJECT_NAME}_CHECKOUT_GIT_SUBMODULES)
    if(Git_FOUND)
        message(STATUS "Git found, submodule update and init")
-        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+        execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init
                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                        RESULT_VARIABLE GIT_SUBMOD_RESULT)
        if(NOT GIT_SUBMOD_RESULT EQUAL "0")
--- a/deps/toml11
+++ b/deps/toml11
--- a/include/ChronoWrapper.h
+++ b/include/ChronoWrapper.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <chrono>
+#include <string>
+
+namespace ChronoWrapper {
+std::chrono::high_resolution_clock::duration TimeFromStringWithLiteral(const std::string& time_str);
+}
--- a/include/Client.h
+++ b/include/Client.h
@@ -66,7 +66,6 @@ public:
    std::string GetCarData(int Ident);
    std::string GetCarPositionRaw(int Ident);
    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
-    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
    void Disconnect(std::string_view Reason);
    bool IsDisconnected() const { return !mSocket.is_open(); }
@@ -75,8 +74,6 @@ public:
    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
    [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
    [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
-    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
-    [[nodiscard]] const ip::tcp::socket& GetDownSock() const { return mDownSocket; }
    [[nodiscard]] ip::tcp::socket& GetTCPSock() { return mSocket; }
    [[nodiscard]] const ip::tcp::socket& GetTCPSock() const { return mSocket; }
    [[nodiscard]] std::string GetRoles() const { return mRole; }
@@ -88,7 +85,7 @@ public:
    void ClearCars();
    [[nodiscard]] int GetID() const { return mID; }
    [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
-    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
+    [[nodiscard]] bool IsUDPConnected() const { return mIsUDPConnected; }
    [[nodiscard]] bool IsSynced() const { return mIsSynced; }
    [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
    [[nodiscard]] bool IsGuest() const { return mIsGuest; }
@@ -100,7 +97,7 @@ public:
    [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { return mPacketsSync; }
    [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
    [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
-    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
+    void SetIsUDPConnected(bool NewIsConnected) { mIsUDPConnected = NewIsConnected; }
    [[nodiscard]] TServer& Server() const;
    void UpdatePingTime();
    int SecondsSinceLastPing();
@@ -109,7 +106,7 @@ private:
    void InsertVehicle(int ID, const std::string& Data);

    TServer& mServer;
-    bool mIsConnected = false;
+    bool mIsUDPConnected = false;
    bool mIsSynced = false;
    bool mIsSyncing = false;
    mutable std::mutex mMissedPacketsMutex;
@@ -122,13 +119,12 @@ private:
    SparseArray<std::string> mVehiclePosition;
    std::string mName = "Unknown Client";
    ip::tcp::socket mSocket;
-    ip::tcp::socket mDownSocket;
    ip::udp::endpoint mUDPAddress {};
    int mUnicycleID = -1;
    std::string mRole;
    std::string mDID;
    int mID = -1;
-    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
+    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime = std::chrono::high_resolution_clock::now();
 };

 std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);
--- a/include/Common.h
+++ b/include/Common.h
@@ -18,6 +18,7 @@

 #pragma once

+#include <algorithm>
 #include <array>
 #include <atomic>
 #include <cstring>
@@ -28,6 +29,7 @@
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
+#include <span>
 #include <sstream>
 #include <unordered_map>
 #include <zlib.h>
@@ -36,6 +38,7 @@
 #include <filesystem>
 namespace fs = std::filesystem;

+#include "Settings.h"
 #include "TConsole.h"

 struct Version {
@@ -58,32 +61,6 @@ using SparseArray = std::unordered_map<size_t, T>;
 class Application final {
 public:
    // types
-    struct TSettings {
-        std::string ServerName { "BeamMP Server" };
-        std::string ServerDesc { "BeamMP Default Description" };
-        std::string ServerTags { "Freeroam" };
-        std::string Resource { "Resources" };
-        std::string MapName { "/levels/gridmap_v2/info.json" };
-        std::string Key {};
-        std::string Password{};
-        std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
-        std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
-        bool HTTPServerEnabled { false };
-        int MaxPlayers { 8 };
-        bool Private { true };
-        int MaxCars { 1 };
-        bool DebugModeEnabled { false };
-        int Port { 30814 };
-        std::string CustomIP {};
-        bool LogChat { true };
-        bool SendErrors { true };
-        bool SendErrorsMessageEnabled { true };
-        int HTTPServerPort { 8080 };
-        std::string HTTPServerIP { "127.0.0.1" };
-        bool HTTPServerUseSSL { false };
-        bool HideUpdateMessages { false };
-        [[nodiscard]] bool HasCustomIP() const { return !CustomIP.empty(); }
-    };

    using TShutdownHandler = std::function<void()>;

@@ -101,7 +78,7 @@ public:
    static std::string PPS() { return mPPS; }
    static void SetPPS(const std::string& NewPPS) { mPPS = NewPPS; }

-    static TSettings Settings;
+    static inline struct Settings Settings { };

    static std::vector<std::string> GetBackendUrlsInOrder() {
        return {
@@ -150,7 +127,7 @@ private:
    static inline std::mutex mShutdownHandlersMutex {};
    static inline std::deque<TShutdownHandler> mShutdownHandlers {};

-    static inline Version mVersion { 3, 4, 0 };
+    static inline Version mVersion { 3, 6, 0 };
 };

 void SplitString(std::string const& str, const char delim, std::vector<std::string>& out);
@@ -223,13 +200,13 @@ void RegisterThread(const std::string& str);
    #define luaprint(x) Application::Console().Write(_this_location + std::string("[LUA] ") + (x))
    #define beammp_debug(x)                                                                   \
        do {                                                                                  \
-            if (Application::Settings.DebugModeEnabled) {                                     \
+            if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
                Application::Console().Write(_this_location + std::string("[DEBUG] ") + (x)); \
            }                                                                                 \
        } while (false)
    #define beammp_event(x)                                                                   \
        do {                                                                                  \
-            if (Application::Settings.DebugModeEnabled) {                                     \
+            if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
                Application::Console().Write(_this_location + std::string("[EVENT] ") + (x)); \
            }                                                                                 \
        } while (false)
@@ -237,7 +214,7 @@ void RegisterThread(const std::string& str);
    #if defined(DEBUG)
        #define beammp_trace(x)                                                                   \
            do {                                                                                  \
-                if (Application::Settings.DebugModeEnabled) {                                     \
+                if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {                                     \
                    Application::Console().Write(_this_location + std::string("[TRACE] ") + (x)); \
                }                                                                                 \
            } while (false)
@@ -286,57 +263,14 @@ void RegisterThread(const std::string& str);

 void LogChatMessage(const std::string& name, int id, const std::string& msg);

-#define Biggest 30000
-
-template <typename T>
-inline T Comp(const T& Data) {
-    std::array<char, Biggest> C {};
-    // obsolete
-    C.fill(0);
-    z_stream defstream;
-    defstream.zalloc = nullptr;
-    defstream.zfree = nullptr;
-    defstream.opaque = nullptr;
-    defstream.avail_in = uInt(Data.size());
-    defstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Data[0]));
-    defstream.avail_out = Biggest;
-    defstream.next_out = reinterpret_cast<Bytef*>(C.data());
-    deflateInit(&defstream, Z_BEST_COMPRESSION);
-    deflate(&defstream, Z_SYNC_FLUSH);
-    deflate(&defstream, Z_FINISH);
-    deflateEnd(&defstream);
-    size_t TotalOut = defstream.total_out;
-    T Ret;
-    Ret.resize(TotalOut);
-    std::fill(Ret.begin(), Ret.end(), 0);
-    std::copy_n(C.begin(), TotalOut, Ret.begin());
-    return Ret;
-}
-
-template <typename T>
-inline T DeComp(const T& Compressed) {
-    std::array<char, Biggest> C {};
-    // not needed
-    C.fill(0);
-    z_stream infstream;
-    infstream.zalloc = nullptr;
-    infstream.zfree = nullptr;
-    infstream.opaque = nullptr;
-    infstream.avail_in = Biggest;
-    infstream.next_in = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(&Compressed[0]));
-    infstream.avail_out = Biggest;
-    infstream.next_out = const_cast<Bytef*>(reinterpret_cast<const Bytef*>(C.data()));
-    inflateInit(&infstream);
-    inflate(&infstream, Z_SYNC_FLUSH);
-    inflate(&infstream, Z_FINISH);
-    inflateEnd(&infstream);
-    size_t TotalOut = infstream.total_out;
-    T Ret;
-    Ret.resize(TotalOut);
-    std::fill(Ret.begin(), Ret.end(), 0);
-    std::copy_n(C.begin(), TotalOut, Ret.begin());
-    return Ret;
-}
+std::vector<uint8_t> Comp(std::span<const uint8_t> input);
+std::vector<uint8_t> DeComp(std::span<const uint8_t> input);

 std::string GetPlatformAgnosticErrorString();
 #define S_DSN SU_RAW
+
+class InvalidDataError : std::runtime_error {
+public:
+    InvalidDataError() : std::runtime_error("Invalid data") {
+    }
+};
--- a/include/CustomAssert.h
+++ b/include/CustomAssert.h
@@ -32,6 +32,7 @@
 #include <thread>

 #include "Common.h"
+#include "Compat.h"

 static const char* const ANSI_RESET = "\u001b[0m";

@@ -56,7 +57,7 @@ static const char* const ANSI_WHITE_BOLD = "\u001b[37;1m";
 static const char* const ANSI_BOLD = "\u001b[1m";
 static const char* const ANSI_UNDERLINE = "\u001b[4m";

-#ifdef DEBUG
+#if defined(DEBUG) && !defined(BEAMMP_FREEBSD)
 #include <iostream>
 inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const char* function, [[maybe_unused]] unsigned line,
    [[maybe_unused]] const char* condition_string, [[maybe_unused]] bool result) {
@@ -81,8 +82,8 @@ inline void _assert([[maybe_unused]] const char* file, [[maybe_unused]] const ch
            beammp_errorf("Assertion failed in '{}:{}': {}.", __func__, _line, #cond); \
        }                                                                              \
    } while (false)
-#define beammp_assert_not_reachable()                                                      \
-    do {                                                                                   \
+#define beammp_assert_not_reachable()                                                                                                                           \
+    do {                                                                                                                                                        \
        beammp_errorf("Assertion failed in '{}:{}': Unreachable code reached. This may result in a crash or undefined state of the program.", __func__, _line); \
    } while (false)
 #endif // DEBUG
--- a/include/Json.h
+++ b/include/Json.h
@@ -17,7 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 #pragma once
-#include "rapidjson/stringbuffer.h"
-#include "rapidjson/prettywriter.h"
 #include "rapidjson/document.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
--- a/include/LuaAPI.h
+++ b/include/LuaAPI.h
@@ -35,8 +35,10 @@ namespace MP {
    inline size_t GetPlayerCount() { return Engine->Server().ClientCount(); }
    std::pair<bool, std::string> DropPlayer(int ID, std::optional<std::string> MaybeReason);
    std::pair<bool, std::string> SendChatMessage(int ID, const std::string& Message);
+    std::pair<bool, std::string> SendNotification(int ID, const std::string& Message, const std::string& Icon, const std::string& Category);
    std::pair<bool, std::string> RemoveVehicle(int PlayerID, int VehicleID);
    void Set(int ConfigID, sol::object NewValue);
+    TLuaValue Get(int ConfigID);
    bool IsPlayerGuest(int ID);
    bool IsPlayerConnected(int ID);
    void Sleep(size_t Ms);
--- a/include/RWMutex.h
+++ b/include/RWMutex.h
@@ -23,8 +23,8 @@
 * and write locks and read locks are mutually exclusive.
 */

-#include <shared_mutex>
 #include <mutex>
+#include <shared_mutex>

 // Use ReadLock(m) and WriteLock(m) to lock it.
 using RWMutex = std::shared_mutex;
--- a/include/Settings.h
+++ b/include/Settings.h
@@ -0,0 +1,144 @@
+// BeamMP, the BeamNG.drive multiplayer mod.
+// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
+//
+// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#pragma once
+#include "Sync.h"
+#include <concepts>
+#include <cstdint>
+#include <doctest/doctest.h>
+#include <fmt/core.h>
+#include <fmt/format.h>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+#include <variant>
+
+struct ComposedKey {
+    std::string Category;
+    std::string Key;
+
+    bool operator==(const ComposedKey& rhs) const {
+        return (this->Category == rhs.Category && this->Key == rhs.Key);
+    }
+};
+
+template <>
+struct fmt::formatter<ComposedKey> : formatter<std::string> {
+    auto format(ComposedKey key, format_context& ctx) const;
+};
+
+inline auto fmt::formatter<ComposedKey>::format(ComposedKey key, fmt::format_context& ctx) const {
+    std::string key_metadata = fmt::format("{}::{}", key.Category, key.Key);
+    return formatter<std::string>::format(key_metadata, ctx);
+}
+
+namespace std {
+template <>
+class hash<ComposedKey> {
+public:
+    std::uint64_t operator()(const ComposedKey& key) const {
+        std::hash<std::string> hash_fn;
+        return hash_fn(key.Category + key.Key);
+    }
+};
+}
+
+struct Settings {
+    using SettingsTypeVariant = std::variant<std::string, bool, int>;
+
+    Settings();
+
+    enum Key {
+        // Keys that correspond to the keys set in TOML
+        // Keys have their TOML section name as prefix
+
+        // [Misc]
+        Misc_SendErrorsShowMessage,
+        Misc_SendErrors,
+        Misc_ImScaredOfUpdates,
+        Misc_UpdateReminderTime,
+
+        // [General]
+        General_Description,
+        General_Tags,
+        General_MaxPlayers,
+        General_Name,
+        General_Map,
+        General_AuthKey,
+        General_Private,
+        General_Port,
+        General_MaxCars,
+        General_LogChat,
+        General_ResourceFolder,
+        General_Debug,
+        General_AllowGuests
+    };
+
+    Sync<std::unordered_map<Key, SettingsTypeVariant>> SettingsMap;
+    enum SettingsAccessMask {
+        READ_ONLY, // Value can be read from console
+        READ_WRITE, // Value can be read and written to from console
+        NO_ACCESS // Value is inaccessible from console (no read OR write)
+    };
+
+    using SettingsAccessControl = std::pair<
+        Key, // The Key's corresponding enum encoding
+        SettingsAccessMask // Console read/write permissions
+        >;
+
+    Sync<std::unordered_map<ComposedKey, SettingsAccessControl>> InputAccessMapping;
+    std::string getAsString(Key key);
+
+    int getAsInt(Key key);
+
+    bool getAsBool(Key key);
+
+    SettingsTypeVariant get(Key key);
+
+    void set(Key key, const std::string& value);
+
+    template <typename Integer, std::enable_if_t<std::is_same_v<Integer, int>, bool> = true>
+    void set(Key key, Integer value) {
+        auto map = SettingsMap.synchronize();
+        if (!map->contains(key)) {
+            throw std::logic_error { "Undefined setting key accessed in Settings::set(int)" };
+        }
+        if (!std::holds_alternative<int>(map->at(key))) {
+            throw std::logic_error { fmt::format("Wrong value type in Settings::set(int): index {}", map->at(key).index()) };
+        }
+        map->at(key) = value;
+    }
+    template <typename Boolean, std::enable_if_t<std::is_same_v<bool, Boolean>, bool> = true>
+    void set(Key key, Boolean value) {
+        auto map = SettingsMap.synchronize();
+        if (!map->contains(key)) {
+            throw std::logic_error { "Undefined setting key accessed in Settings::set(bool)" };
+        }
+        if (!std::holds_alternative<bool>(map->at(key))) {
+            throw std::logic_error { fmt::format("Wrong value type in Settings::set(bool): index {}", map->at(key).index()) };
+        }
+        map->at(key) = value;
+    }
+
+    const std::unordered_map<ComposedKey, SettingsAccessControl> getAccessControlMap() const;
+    SettingsAccessControl getConsoleInputAccessMapping(const ComposedKey& keyName);
+
+    void setConsoleInputAccessMapping(const ComposedKey& keyName, const std::string& value);
+    void setConsoleInputAccessMapping(const ComposedKey& keyName, int value);
+    void setConsoleInputAccessMapping(const ComposedKey& keyName, bool value);
+};
--- a/include/Sync.h
+++ b/include/Sync.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <boost/thread/synchronized_value.hpp>
+#include <mutex>
+
+/// This header provides convenience aliases for synchronization primitives.
+
+template <typename T>
+using Sync = boost::synchronized_value<T, std::recursive_mutex>;
--- a/include/TConfig.h
+++ b/include/TConfig.h
@@ -19,6 +19,7 @@
 #pragma once

 #include "Common.h"
+#include "Settings.h"

 #include <atomic>
 #include <filesystem>
@@ -40,9 +41,7 @@ public:
 private:
    void CreateConfigFile();
    void ParseFromFile(std::string_view name);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue);
-    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue);
+    void TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, Settings::Key key);

    void ParseOldFormat();
    std::string TagsAsPrettyArray() const;
--- a/include/TLuaEngine.h
+++ b/include/TLuaEngine.h
@@ -167,7 +167,7 @@ public:
    void ReportErrors(const std::vector<std::shared_ptr<TLuaResult>>& Results);
    bool HasState(TLuaStateId StateId);
    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(TLuaStateId StateID, const TLuaChunk& Script);
-    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args);
+    [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName);
    void EnsureStateExists(TLuaStateId StateId, const std::string& Name, bool DontCallOnInit = false);
    void RegisterEvent(const std::string& EventName, TLuaStateId StateId, const std::string& FunctionName);
    /**
@@ -192,7 +192,9 @@ public:
        for (const auto& Event : mLuaEvents.at(EventName)) {
            for (const auto& Function : Event.second) {
                if (Event.first != IgnoreId) {
-                    Results.push_back(EnqueueFunctionCall(Event.first, Function, Arguments));
+                    auto Result = EnqueueFunctionCall(Event.first, Function, Arguments, EventName);
+                    Results.push_back(Result);
+                    AddResultToCheck(Result);
                }
            }
        }
@@ -209,7 +211,7 @@ public:
        std::vector<TLuaValue> Arguments { TLuaValue { std::forward<ArgsT>(Args) }... };
        const auto Handlers = GetEventHandlersForState(EventName, StateId);
        for (const auto& Handler : Handlers) {
-            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments));
+            Results.push_back(EnqueueFunctionCall(StateId, Handler, Arguments, EventName));
        }
        return Results;
    }
@@ -243,7 +245,7 @@ private:
        StateThreadData(const StateThreadData&) = delete;
        virtual ~StateThreadData() noexcept { beammp_debug("\"" + mStateId + "\" destroyed"); }
        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueScript(const TLuaChunk& Script);
-        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args);
+        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName);
        [[nodiscard]] std::shared_ptr<TLuaResult> EnqueueFunctionCallFromCustomEvent(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName, CallStrategy Strategy);
        void RegisterEvent(const std::string& EventName, const std::string& FunctionName);
        void AddPath(const fs::path& Path); // to be added to path and cpath
@@ -261,6 +263,7 @@ private:
        sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
        sol::table Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs);
        sol::table Lua_GetPlayerIdentifiers(int ID);
+        std::variant<std::string, sol::nil_t> Lua_GetPlayerRole(int ID);
        sol::table Lua_GetPlayers();
        std::string Lua_GetPlayerName(int ID);
        sol::table Lua_GetPlayerVehicles(int ID);
--- a/include/TNetwork.h
+++ b/include/TNetwork.h
@@ -58,7 +58,6 @@ private:
    std::mutex mOpenIDMutex;

    std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
-    void HandleDownload(TConnection&& TCPSock);
    void OnConnect(const std::weak_ptr<TClient>& c);
    void TCPClient(const std::weak_ptr<TClient>& c);
    void Looper(const std::weak_ptr<TClient>& c);
@@ -67,7 +66,7 @@ private:
    void Parse(TClient& c, const std::vector<uint8_t>& Packet);
    void SendFile(TClient& c, const std::string& Name);
    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
-    static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
+    static void SendFileToClient(TClient& c, size_t Size, const std::string& Name);
    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };

--- a/include/TPPSMonitor.h
+++ b/include/TPPSMonitor.h
@@ -27,7 +27,7 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
    explicit TPPSMonitor(TServer& Server);
-    virtual ~TPPSMonitor() {}
+    virtual ~TPPSMonitor() { }

    void operator()() override;

--- a/include/TResourceManager.h
+++ b/include/TResourceManager.h
@@ -19,6 +19,7 @@
 #pragma once

 #include "Common.h"
+#include <nlohmann/json.hpp>

 class TResourceManager {
 public:
@@ -30,10 +31,17 @@ public:
    [[nodiscard]] std::string FileSizes() const { return mFileSizes; }
    [[nodiscard]] int ModsLoaded() const { return mModsLoaded; }

+    [[nodiscard]] std::string NewFileList() const;
+
+    void RefreshFiles();
+
 private:
    size_t mMaxModSize = 0;
    std::string mFileSizes;
    std::string mFileList;
    std::string mTrimmedList;
    int mModsLoaded = 0;
+
+    std::mutex mModsMutex;
+    nlohmann::json mMods;
 };
--- a/scripts/ubuntu-24.04/1-install-deps.sh
+++ b/scripts/ubuntu-24.04/1-install-deps.sh
--- a/scripts/ubuntu-24.04/1.5-git-safe.sh
+++ b/scripts/ubuntu-24.04/1.5-git-safe.sh
--- a/scripts/ubuntu-24.04/2-configure.sh
+++ b/scripts/ubuntu-24.04/2-configure.sh
--- a/scripts/ubuntu-24.04/3-build-tests.sh
+++ b/scripts/ubuntu-24.04/3-build-tests.sh
--- a/scripts/ubuntu-24.04/3-build.sh
+++ b/scripts/ubuntu-24.04/3-build.sh
--- a/scripts/ubuntu-24.04/4-install-runtime-deps.sh
+++ b/scripts/ubuntu-24.04/4-install-runtime-deps.sh
--- a/src/ChronoWrapper.cpp
+++ b/src/ChronoWrapper.cpp
@@ -0,0 +1,23 @@
+#include "ChronoWrapper.h"
+#include "Common.h"
+#include <regex>
+
+std::chrono::high_resolution_clock::duration ChronoWrapper::TimeFromStringWithLiteral(const std::string& time_str) {
+    // const std::regex time_regex(R"((\d+\.{0,1}\d*)(min|ms|us|ns|[dhs]))"); //i.e one of: "25ns, 6us, 256ms, 2s, 13min, 69h, 356d" will get matched (only available in newer C++ versions)
+    const std::regex time_regex(R"((\d+\.{0,1}\d*)(min|[dhs]))"); // i.e one of: "2.01s, 13min, 69h, 356.69d" will get matched
+    std::smatch match;
+    float time_value;
+    if (!std::regex_search(time_str, match, time_regex))
+        return std::chrono::nanoseconds(0);
+    time_value = stof(match.str(1));
+    if (match.str(2) == "d") {
+        return std::chrono::seconds((uint64_t)(time_value * 86400)); // 86400 seconds in a day
+    } else if (match.str(2) == "h") {
+        return std::chrono::seconds((uint64_t)(time_value * 3600)); // 3600 seconds in an hour
+    } else if (match.str(2) == "min") {
+        return std::chrono::seconds((uint64_t)(time_value * 60));
+    } else if (match.str(2) == "s") {
+        return std::chrono::seconds((uint64_t)time_value);
+    }
+    return std::chrono::nanoseconds(0);
+}
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -144,7 +144,6 @@ void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
 TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
    : mServer(Server)
    , mSocket(std::move(Socket))
-    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
    , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }

--- a/src/Common.cpp
+++ b/src/Common.cpp
@@ -22,7 +22,9 @@
 #include "TConsole.h"
 #include <array>
 #include <charconv>
+#include <chrono>
 #include <fmt/core.h>
+#include <fstream>
 #include <iostream>
 #include <map>
 #include <regex>
@@ -33,8 +35,6 @@
 #include "CustomAssert.h"
 #include "Http.h"

-Application::TSettings Application::Settings = {};
-
 void Application::RegisterShutdownHandler(const TShutdownHandler& Handler) {
    std::unique_lock Lock(mShutdownHandlersMutex);
    if (Handler) {
@@ -256,7 +256,7 @@ static std::mutex ThreadNameMapMutex {};

 std::string ThreadName(bool DebugModeOverride) {
    auto Lock = std::unique_lock(ThreadNameMapMutex);
-    if (DebugModeOverride || Application::Settings.DebugModeEnabled) {
+    if (DebugModeOverride || Application::Settings.getAsBool(Settings::Key::General_Debug)) {
        auto id = std::this_thread::get_id();
        if (threadNameMap.find(id) != threadNameMap.end()) {
            // found
@@ -268,21 +268,21 @@ std::string ThreadName(bool DebugModeOverride) {

 TEST_CASE("ThreadName") {
    RegisterThread("MyThread");
-    auto OrigDebug = Application::Settings.DebugModeEnabled;
+    auto OrigDebug = Application::Settings.getAsBool(Settings::Key::General_Debug);

    // ThreadName adds a space at the end, legacy but we need it still
    SUBCASE("Debug mode enabled") {
-        Application::Settings.DebugModeEnabled = true;
+        Application::Settings.set(Settings::Key::General_Debug, true);
        CHECK(ThreadName(true) == "MyThread ");
        CHECK(ThreadName(false) == "MyThread ");
    }
    SUBCASE("Debug mode disabled") {
-        Application::Settings.DebugModeEnabled = false;
+        Application::Settings.set(Settings::Key::General_Debug, false);
        CHECK(ThreadName(true) == "MyThread ");
        CHECK(ThreadName(false) == "");
    }
    // cleanup
-    Application::Settings.DebugModeEnabled = OrigDebug;
+    Application::Settings.set(Settings::Key::General_Debug, OrigDebug);
 }

 void RegisterThread(const std::string& str) {
@@ -296,7 +296,7 @@ void RegisterThread(const std::string& str) {
 #elif defined(BEAMMP_FREEBSD)
    ThreadId = std::to_string(getpid());
 #endif
-    if (Application::Settings.DebugModeEnabled) {
+    if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {
        std::ofstream ThreadFile(".Threads.log", std::ios::app);
        ThreadFile << ("Thread \"" + str + "\" is TID " + ThreadId) << std::endl;
    }
@@ -329,7 +329,7 @@ TEST_CASE("Version::AsString") {
 }

 void LogChatMessage(const std::string& name, int id, const std::string& msg) {
-    if (Application::Settings.LogChat) {
+    if (Application::Settings.getAsBool(Settings::Key::General_LogChat)) {
        std::stringstream ss;
        ss << ThreadName();
        ss << "[CHAT] ";
@@ -384,3 +384,67 @@ void SplitString(const std::string& str, const char delim, std::vector<std::stri
        out.push_back(str.substr(start, end - start));
    }
 }
+static constexpr size_t STARTING_MAX_DECOMPRESSION_BUFFER_SIZE = 15 * 1024 * 1024;
+static constexpr size_t MAX_DECOMPRESSION_BUFFER_SIZE = 30 * 1024 * 1024;
+
+std::vector<uint8_t> DeComp(std::span<const uint8_t> input) {
+    beammp_debugf("got {} bytes of input data", input.size());
+
+    // start with a decompression buffer of 5x the input size, clamped to a maximum of 15 MB.
+    // this buffer can and will grow, but we don't want to start it too large. A 5x compression ratio
+    // is pretty optimistic.
+    std::vector<uint8_t> output_buffer(std::min<size_t>(input.size() * 5, STARTING_MAX_DECOMPRESSION_BUFFER_SIZE));
+
+    uLongf output_size = output_buffer.size();
+
+    while (true) {
+        int res = uncompress(
+            reinterpret_cast<Bytef*>(output_buffer.data()),
+            &output_size,
+            reinterpret_cast<const Bytef*>(input.data()),
+            static_cast<uLongf>(input.size()));
+        if (res == Z_BUF_ERROR) {
+            // We assume that a reasonable maximum size for decompressed packets exists. We want to avoid
+            // a client effectively "zip bombing" us by sending a lot of small packets which decompress
+            // into huge data.
+            // If this limit were to be an issue, this could be made configurable, however clients have a similar
+            // limit. For that reason, we just reject packets which decompress into too much data.
+            if (output_buffer.size() >= MAX_DECOMPRESSION_BUFFER_SIZE) {
+                throw std::runtime_error(fmt::format("decompressed packet size of {} bytes exceeded", MAX_DECOMPRESSION_BUFFER_SIZE));
+            }
+            // if decompression fails, we double the buffer size (up to the allowed limit) and try again
+            output_buffer.resize(std::max<size_t>(output_buffer.size() * 2, MAX_DECOMPRESSION_BUFFER_SIZE));
+            beammp_warnf("zlib uncompress() failed, trying with a larger buffer size of {}", output_buffer.size());
+            output_size = output_buffer.size();
+        } else if (res != Z_OK) {
+            beammp_error("zlib uncompress() failed: " + std::to_string(res));
+            if (res == Z_DATA_ERROR) {
+                throw InvalidDataError {};
+            } else {
+                throw std::runtime_error("zlib uncompress() failed");
+            }
+        } else if (res == Z_OK) {
+            break;
+        }
+    }
+    output_buffer.resize(output_size);
+    return output_buffer;
+}
+
+std::vector<uint8_t> Comp(std::span<const uint8_t> input) {
+    auto max_size = compressBound(input.size());
+    std::vector<uint8_t> output(max_size);
+    uLongf output_size = output.size();
+    int res = compress(
+        reinterpret_cast<Bytef*>(output.data()),
+        &output_size,
+        reinterpret_cast<const Bytef*>(input.data()),
+        static_cast<uLongf>(input.size()));
+    if (res != Z_OK) {
+        beammp_error("zlib compress() failed: " + std::to_string(res));
+        throw std::runtime_error("zlib compress() failed");
+    }
+    beammp_debug("zlib compressed " + std::to_string(input.size()) + " B to " + std::to_string(output_size) + " B");
+    output.resize(output_size);
+    return output;
+}
--- a/src/Compat.cpp
+++ b/src/Compat.cpp
@@ -61,7 +61,7 @@ TEST_CASE("init and reset termios") {
        CHECK_EQ(current.c_lflag, original.c_lflag);
 #ifndef BEAMMP_FREEBSD // The 'c_line' attribute seems to only exist on Linux, so we need to omit it on other platforms
        CHECK_EQ(current.c_line, original.c_line);
-#endif 
+#endif
        CHECK_EQ(current.c_oflag, original.c_oflag);
        CHECK_EQ(current.c_ospeed, original.c_ospeed);
    }
--- a/src/Http.cpp
+++ b/src/Http.cpp
@@ -28,15 +28,42 @@
 #include <random>
 #include <stdexcept>

-// TODO: Add sentry error handling back
-
 using json = nlohmann::json;
+struct Connection {
+    std::string host {};
+    int port {};
+    Connection() = default;
+    Connection(std::string host, int port)
+        : host(host)
+        , port(port) {};
+};
+constexpr uint8_t CONNECTION_AMOUNT = 10;
+static thread_local uint8_t write_index = 0;
+static thread_local std::array<Connection, CONNECTION_AMOUNT> connections;
+static thread_local std::array<std::shared_ptr<httplib::SSLClient>, CONNECTION_AMOUNT> clients;
+
+[[nodiscard]] static std::shared_ptr<httplib::SSLClient> getClient(Connection connectionInfo) {
+    for (uint8_t i = 0; i < CONNECTION_AMOUNT; i++) {
+        if (connectionInfo.host == connections[i].host
+            && connectionInfo.port == connections[i].port) {
+            beammp_tracef("Old client reconnected, with ip {} and port {}", connectionInfo.host, connectionInfo.port);
+            return clients[i];
+        }
+    }
+    uint8_t i = write_index;
+    write_index++;
+    write_index %= CONNECTION_AMOUNT;
+    clients[i] = std::make_shared<httplib::SSLClient>(connectionInfo.host, connectionInfo.port);
+    connections[i] = { connectionInfo.host, connectionInfo.port };
+    beammp_tracef("New client connected, with ip {} and port {}", connectionInfo.host, connectionInfo.port);
+    return clients[i];
+}

 std::string Http::GET(const std::string& host, int port, const std::string& target, unsigned int* status) {
-    httplib::SSLClient client(host, port);
-    client.enable_server_certificate_verification(false);
-    client.set_address_family(AF_INET);
-    auto res = client.Get(target.c_str());
+    std::shared_ptr<httplib::SSLClient> client = getClient({ host, port });
+    client->enable_server_certificate_verification(false);
+    client->set_address_family(AF_INET);
+    auto res = client->Get(target.c_str());
    if (res) {
        if (status) {
            *status = res->status;
@@ -48,12 +75,12 @@ std::string Http::GET(const std::string& host, int port, const std::string& targ
 }

 std::string Http::POST(const std::string& host, int port, const std::string& target, const std::string& body, const std::string& ContentType, unsigned int* status, const httplib::Headers& headers) {
-    httplib::SSLClient client(host, port);
-    client.set_read_timeout(std::chrono::seconds(10));
-    beammp_assert(client.is_valid());
-    client.enable_server_certificate_verification(false);
-    client.set_address_family(AF_INET);
-    auto res = client.Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
+    std::shared_ptr<httplib::SSLClient> client = getClient({ host, port });
+    client->set_read_timeout(std::chrono::seconds(10));
+    beammp_assert(client->is_valid());
+    client->enable_server_certificate_verification(false);
+    client->set_address_family(AF_INET);
+    auto res = client->Post(target.c_str(), headers, body.c_str(), body.size(), ContentType.c_str());
    if (res) {
        if (status) {
            *status = res->status;
@@ -172,7 +199,6 @@ Http::Server::THttpServerInstance::THttpServerInstance() {
 }

 void Http::Server::THttpServerInstance::operator()() try {
-    beammp_info("HTTP(S) Server started on port " + std::to_string(Application::Settings.HTTPServerPort));
    std::unique_ptr<httplib::Server> HttpLibServerInstance;
    HttpLibServerInstance = std::make_unique<httplib::Server>();
    // todo: make this IP agnostic so people can set their own IP
@@ -214,10 +240,6 @@ void Http::Server::THttpServerInstance::operator()() try {
        beammp_debug("Http Server: " + Req.method + " " + Req.target + " -> " + std::to_string(Res.status));
    });
    Application::SetSubsystemStatus("HTTPServer", Application::Status::Good);
-    auto ret = HttpLibServerInstance->listen(Application::Settings.HTTPServerIP.c_str(), Application::Settings.HTTPServerPort);
-    if (!ret) {
-        beammp_error("Failed to start http server (failed to listen). Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it.");
-    }
 } catch (const std::exception& e) {
    beammp_error("Failed to start http server. Please ensure the http server is configured properly in the ServerConfig.toml, or turn it off if you don't need it. Error: " + std::string(e.what()));
 }
--- a/src/LuaAPI.cpp
+++ b/src/LuaAPI.cpp
@@ -20,6 +20,7 @@
 #include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
+#include "Settings.h"
 #include "TLuaEngine.h"

 #include <nlohmann/json.hpp>
@@ -60,7 +61,11 @@ std::string LuaAPI::LuaToString(const sol::object Value, size_t Indent, bool Quo
        }
    case sol::type::number: {
        std::stringstream ss;
-        ss << Value.as<float>();
+        if (Value.is<int>()) {
+            ss << Value.as<int>();
+        } else {
+            ss << Value.as<float>();
+        }
        return ss.str();
    }
    case sol::type::lua_nil:
@@ -200,6 +205,37 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
    return Result;
 }

+std::pair<bool, std::string> LuaAPI::MP::SendNotification(int ID, const std::string& Message, const std::string& Icon, const std::string& Category) {
+    std::pair<bool, std::string> Result;
+    std::string Packet = "N" + Category + ":" + Icon + ":" + Message;
+    if (ID == -1) {
+        Engine->Network().SendToAll(nullptr, StringToVector(Packet), true, true);
+        Result.first = true;
+    } else {
+        auto MaybeClient = GetClient(Engine->Server(), ID);
+        if (MaybeClient) {
+            auto c = MaybeClient.value().lock();
+            if (!c->IsSynced()) {
+                Result.first = false;
+                Result.second = "Player is not synced yet";
+                return Result;
+            }
+            if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
+                beammp_errorf("Failed to send notification to player (id {}) - did the player disconnect?", ID);
+                Result.first = false;
+                Result.second = "Failed to send packet";
+            }
+            Result.first = true;
+        } else {
+            beammp_lua_error("SendNotification invalid argument [1] invalid ID");
+            Result.first = false;
+            Result.second = "Invalid Player ID";
+        }
+        return Result;
+    }
+    return Result;
+}
+
 std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
    std::pair<bool, std::string> Result;
    auto MaybeClient = GetClient(Engine->Server(), PID);
@@ -212,6 +248,7 @@ std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
    auto c = MaybeClient.value().lock();
    if (!c->GetCarData(VID).empty()) {
        std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
+        LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", PID, VID));
        Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
        c->DeleteCar(VID);
        Result.first = true;
@@ -226,56 +263,56 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
    switch (ConfigID) {
    case 0: // debug
        if (NewValue.is<bool>()) {
-            Application::Settings.DebugModeEnabled = NewValue.as<bool>();
-            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.DebugModeEnabled ? "true" : "false"));
+            Application::Settings.set(Settings::Key::General_Debug, NewValue.as<bool>());
+            beammp_info(std::string("Set `Debug` to ") + (Application::Settings.getAsBool(Settings::Key::General_Debug) ? "true" : "false"));
        } else {
            beammp_lua_error("set invalid argument [2] expected boolean");
        }
        break;
    case 1: // private
        if (NewValue.is<bool>()) {
-            Application::Settings.Private = NewValue.as<bool>();
-            beammp_info(std::string("Set `Private` to ") + (Application::Settings.Private ? "true" : "false"));
+            Application::Settings.set(Settings::Key::General_Private, NewValue.as<bool>());
+            beammp_info(std::string("Set `Private` to ") + (Application::Settings.getAsBool(Settings::Key::General_Private) ? "true" : "false"));
        } else {
            beammp_lua_error("set invalid argument [2] expected boolean");
        }
        break;
    case 2: // max cars
        if (NewValue.is<int>()) {
-            Application::Settings.MaxCars = NewValue.as<int>();
-            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.MaxCars));
+            Application::Settings.set(Settings::Key::General_MaxCars, NewValue.as<int>());
+            beammp_info(std::string("Set `MaxCars` to ") + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxCars)));
        } else {
            beammp_lua_error("set invalid argument [2] expected integer");
        }
        break;
    case 3: // max players
        if (NewValue.is<int>()) {
-            Application::Settings.MaxPlayers = NewValue.as<int>();
-            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.MaxPlayers));
+            Application::Settings.set(Settings::Key::General_MaxPlayers, NewValue.as<int>());
+            beammp_info(std::string("Set `MaxPlayers` to ") + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)));
        } else {
            beammp_lua_error("set invalid argument [2] expected integer");
        }
        break;
    case 4: // Map
        if (NewValue.is<std::string>()) {
-            Application::Settings.MapName = NewValue.as<std::string>();
-            beammp_info(std::string("Set `Map` to ") + Application::Settings.MapName);
+            Application::Settings.set(Settings::Key::General_Map, NewValue.as<std::string>());
+            beammp_info(std::string("Set `Map` to ") + Application::Settings.getAsString(Settings::Key::General_Map));
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
        break;
    case 5: // Name
        if (NewValue.is<std::string>()) {
-            Application::Settings.ServerName = NewValue.as<std::string>();
-            beammp_info(std::string("Set `Name` to ") + Application::Settings.ServerName);
+            Application::Settings.set(Settings::Key::General_Name, NewValue.as<std::string>());
+            beammp_info(std::string("Set `Name` to ") + Application::Settings.getAsString(Settings::Key::General_Name));
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
        break;
    case 6: // Desc
        if (NewValue.is<std::string>()) {
-            Application::Settings.ServerDesc = NewValue.as<std::string>();
-            beammp_info(std::string("Set `Description` to ") + Application::Settings.ServerDesc);
+            Application::Settings.set(Settings::Key::General_Description, NewValue.as<std::string>());
+            beammp_info(std::string("Set `Description` to ") + Application::Settings.getAsString(Settings::Key::General_Description));
        } else {
            beammp_lua_error("set invalid argument [2] expected string");
        }
@@ -286,6 +323,28 @@ void LuaAPI::MP::Set(int ConfigID, sol::object NewValue) {
    }
 }

+TLuaValue LuaAPI::MP::Get(int ConfigID) {
+    switch (ConfigID) {
+    case 0: // debug
+        return Application::Settings.getAsBool(Settings::Key::General_Debug);
+    case 1: // private
+        return Application::Settings.getAsBool(Settings::Key::General_Private);
+    case 2: // max cars
+        return Application::Settings.getAsInt(Settings::Key::General_MaxCars);
+    case 3: // max players
+        return Application::Settings.getAsInt(Settings::Key::General_MaxPlayers);
+    case 4: // Map
+        return Application::Settings.getAsString(Settings::Key::General_Map);
+    case 5: // Name
+        return Application::Settings.getAsString(Settings::Key::General_Name);
+    case 6: // Desc
+        return Application::Settings.getAsString(Settings::Key::General_Description);
+    default:
+        beammp_warn("Invalid config ID \"" + std::to_string(ConfigID) + "\". Use `MP.Settings.*` enum for this.");
+        return 0;
+    }
+}
+
 void LuaAPI::MP::Sleep(size_t Ms) {
    std::this_thread::sleep_for(std::chrono::milliseconds(Ms));
 }
@@ -293,7 +352,7 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 bool LuaAPI::MP::IsPlayerConnected(int ID) {
    auto MaybeClient = GetClient(Engine->Server(), ID);
    if (MaybeClient && !MaybeClient.value().expired()) {
-        return MaybeClient.value().lock()->IsConnected();
+        return MaybeClient.value().lock()->IsUDPConnected();
    } else {
        return false;
    }
@@ -561,7 +620,11 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
        key = left.as<std::string>();
        break;
    case sol::type::number:
-        key = std::to_string(left.as<double>());
+        if (left.is<int>()) {
+            key = std::to_string(left.as<int>());
+        } else {
+            key = std::to_string(left.as<double>());
+        }
        break;
    default:
        beammp_assert_not_reachable();
@@ -589,21 +652,30 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
    case sol::type::string:
        value = right.as<std::string>();
        break;
-    case sol::type::number:
-        value = right.as<double>();
+    case sol::type::number: {
+        if (right.is<int>()) {
+            value = right.as<int>();
+        } else {
+            value = right.as<double>();
+        }
        break;
+    }
    case sol::type::function:
        beammp_lua_warn("unsure what to do with function in JsonEncode, ignoring");
        return;
    case sol::type::table: {
-        bool local_is_array = true;
-        for (const auto& pair : right.as<sol::table>()) {
-            if (pair.first.get_type() != sol::type::number) {
-                local_is_array = false;
+        if (right.as<sol::table>().empty()) {
+            value = nlohmann::json::object();
+        } else {
+            bool local_is_array = true;
+            for (const auto& pair : right.as<sol::table>()) {
+                if (pair.first.get_type() != sol::type::number) {
+                    local_is_array = false;
+                }
+            }
+            for (const auto& pair : right.as<sol::table>()) {
+                JsonEncodeRecursive(value, pair.first, pair.second, local_is_array, depth + 1);
            }
-        }
-        for (const auto& pair : right.as<sol::table>()) {
-            JsonEncodeRecursive(value, pair.first, pair.second, local_is_array, depth + 1);
        }
        break;
    }
@@ -620,14 +692,18 @@ static void JsonEncodeRecursive(nlohmann::json& json, const sol::object& left, c
 std::string LuaAPI::MP::JsonEncode(const sol::table& object) {
    nlohmann::json json;
    // table
-    bool is_array = true;
-    for (const auto& pair : object.as<sol::table>()) {
-        if (pair.first.get_type() != sol::type::number) {
-            is_array = false;
+    if (object.as<sol::table>().empty()) {
+        json = nlohmann::json::object();
+    } else {
+        bool is_array = true;
+        for (const auto& pair : object.as<sol::table>()) {
+            if (pair.first.get_type() != sol::type::number) {
+                is_array = false;
+            }
+        }
+        for (const auto& entry : object) {
+            JsonEncodeRecursive(json, entry.first, entry.second, is_array);
        }
-    }
-    for (const auto& entry : object) {
-        JsonEncodeRecursive(json, entry.first, entry.second, is_array);
    }
    return json.dump();
 }
--- a/src/Profiling.cpp
+++ b/src/Profiling.cpp
@@ -57,4 +57,3 @@ size_t prof::UnitExecutionTime::measurement_count() const {
    std::unique_lock lock(m_mtx);
    return m_total_calls;
 }
-
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -0,0 +1,191 @@
+// BeamMP, the BeamNG.drive multiplayer mod.
+// Copyright (C) 2024 BeamMP Ltd., BeamMP team and contributors.
+//
+// BeamMP Ltd. can be contacted by electronic mail via contact@beammp.com.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#include "Settings.h"
+
+Settings::Settings() {
+    SettingsMap = std::unordered_map<Key, SettingsTypeVariant> {
+        // All entries which contain std::strings must be explicitly constructed, otherwise they become 'bool'
+        { General_Description, std::string("BeamMP Default Description") },
+        { General_Tags, std::string("Freeroam") },
+        { General_MaxPlayers, 8 },
+        { General_Name, std::string("BeamMP Server") },
+        { General_Map, std::string("/levels/gridmap_v2/info.json") },
+        { General_AuthKey, std::string("") },
+        { General_Private, true },
+        { General_Port, 30814 },
+        { General_MaxCars, 1 },
+        { General_LogChat, true },
+        { General_ResourceFolder, std::string("Resources") },
+        { General_Debug, false },
+        { General_AllowGuests, true },
+        { Misc_SendErrorsShowMessage, true },
+        { Misc_SendErrors, true },
+        { Misc_ImScaredOfUpdates, true },
+        { Misc_UpdateReminderTime, "30s" }
+    };
+
+    InputAccessMapping = std::unordered_map<ComposedKey, SettingsAccessControl> {
+        { { "General", "Description" }, { General_Description, READ_WRITE } },
+        { { "General", "Tags" }, { General_Tags, READ_WRITE } },
+        { { "General", "MaxPlayers" }, { General_MaxPlayers, READ_WRITE } },
+        { { "General", "Name" }, { General_Name, READ_WRITE } },
+        { { "General", "Map" }, { General_Map, READ_WRITE } },
+        { { "General", "AuthKey" }, { General_AuthKey, NO_ACCESS } },
+        { { "General", "Private" }, { General_Private, READ_ONLY } },
+        { { "General", "Port" }, { General_Port, READ_ONLY } },
+        { { "General", "MaxCars" }, { General_MaxCars, READ_WRITE } },
+        { { "General", "LogChat" }, { General_LogChat, READ_ONLY } },
+        { { "General", "ResourceFolder" }, { General_ResourceFolder, READ_ONLY } },
+        { { "General", "Debug" }, { General_Debug, READ_WRITE } },
+        { { "General", "AllowGuests" }, { General_AllowGuests, READ_WRITE } },
+        { { "Misc", "SendErrorsShowMessage" }, { Misc_SendErrorsShowMessage, READ_WRITE } },
+        { { "Misc", "SendErrors" }, { Misc_SendErrors, READ_WRITE } },
+        { { "Misc", "ImScaredOfUpdates" }, { Misc_ImScaredOfUpdates, READ_WRITE } },
+        { { "Misc", "UpdateReminderTime" }, { Misc_UpdateReminderTime, READ_WRITE } }
+    };
+}
+
+std::string Settings::getAsString(Key key) {
+    auto map = SettingsMap.synchronize();
+    if (!map->contains(key)) {
+        throw std::logic_error { "Undefined key accessed in Settings::getAsString" };
+    }
+    return std::get<std::string>(map->at(key));
+}
+int Settings::getAsInt(Key key) {
+    auto map = SettingsMap.synchronize();
+    if (!map->contains(key)) {
+        throw std::logic_error { "Undefined key accessed in Settings::getAsInt" };
+    }
+    return std::get<int>(map->at(key));
+}
+
+bool Settings::getAsBool(Key key) {
+    auto map = SettingsMap.synchronize();
+    if (!map->contains(key)) {
+        throw std::logic_error { "Undefined key accessed in Settings::getAsBool" };
+    }
+    return std::get<bool>(map->at(key));
+}
+
+Settings::SettingsTypeVariant Settings::get(Key key) {
+    auto map = SettingsMap.synchronize();
+    if (!map->contains(key)) {
+        throw std::logic_error { "Undefined setting key accessed in Settings::get" };
+    }
+    return map->at(key);
+}
+
+void Settings::set(Key key, const std::string& value) {
+    auto map = SettingsMap.synchronize();
+    if (!map->contains(key)) {
+        throw std::logic_error { "Undefined setting key accessed in Settings::set(std::string)" };
+    }
+    if (!std::holds_alternative<std::string>(map->at(key))) {
+        throw std::logic_error { fmt::format("Wrong value type in Settings::set(std::string): index {}", map->at(key).index()) };
+    }
+    map->at(key) = value;
+}
+
+const std::unordered_map<ComposedKey, Settings::SettingsAccessControl> Settings::getAccessControlMap() const {
+    return *InputAccessMapping;
+}
+
+Settings::SettingsAccessControl Settings::getConsoleInputAccessMapping(const ComposedKey& keyName) {
+    auto acl_map = InputAccessMapping.synchronize();
+    if (!acl_map->contains(keyName)) {
+        throw std::logic_error { "Unknown key name accessed in Settings::getConsoleInputAccessMapping" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
+        throw std::logic_error { "Setting '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
+    }
+    return acl_map->at(keyName);
+}
+
+void Settings::setConsoleInputAccessMapping(const ComposedKey& keyName, const std::string& value) {
+    auto [map, acl_map] = boost::synchronize(SettingsMap, InputAccessMapping);
+    if (!acl_map->contains(keyName)) {
+        throw std::logic_error { "Unknown key name accessed in Settings::setConsoleInputAccessMapping" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
+        throw std::logic_error { "Setting '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::READ_ONLY) {
+        throw std::logic_error { "Setting '" + keyName.Category + "::" + keyName.Key + "' is not writeable from within the runtime!" };
+    }
+
+    Key key = acl_map->at(keyName).first;
+
+    if (!std::holds_alternative<std::string>(map->at(key))) {
+        throw std::logic_error { "Wrong value type in Settings::setConsoleInputAccessMapping: expected std::string" };
+    }
+
+    map->at(key) = value;
+}
+
+void Settings::setConsoleInputAccessMapping(const ComposedKey& keyName, int value) {
+    auto [map, acl_map] = boost::synchronize(SettingsMap, InputAccessMapping);
+    if (!acl_map->contains(keyName)) {
+        throw std::logic_error { "Unknown key name accessed in Settings::setConsoleInputAccessMapping" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
+        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::READ_ONLY) {
+        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not writeable from within the runtime!" };
+    }
+
+    Key key = acl_map->at(keyName).first;
+
+    if (!std::holds_alternative<int>(map->at(key))) {
+        throw std::logic_error { "Wrong value type in Settings::setConsoleInputAccessMapping: expected int" };
+    }
+
+    map->at(key) = value;
+}
+
+void Settings::setConsoleInputAccessMapping(const ComposedKey& keyName, bool value) {
+    auto [map, acl_map] = boost::synchronize(SettingsMap, InputAccessMapping);
+    if (!acl_map->contains(keyName)) {
+        throw std::logic_error { "Unknown key name accessed in Settings::setConsoleInputAccessMapping" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::NO_ACCESS) {
+        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not accessible from within the runtime!" };
+    } else if (acl_map->at(keyName).second == SettingsAccessMask::READ_ONLY) {
+        throw std::logic_error { "Key '" + keyName.Category + "::" + keyName.Key + "' is not writeable from within the runtime!" };
+    }
+
+    Key key = acl_map->at(keyName).first;
+
+    if (!std::holds_alternative<bool>(map->at(key))) {
+        throw std::logic_error { "Wrong value type in Settings::setConsoleInputAccessMapping: expected bool" };
+    }
+
+    map->at(key) = value;
+}
+
+TEST_CASE("settings get/set") {
+    Settings settings;
+    settings.set(Settings::General_Name, "hello, world");
+    CHECK_EQ(settings.getAsString(Settings::General_Name), "hello, world");
+    settings.set(Settings::General_Name, std::string("hello, world"));
+    CHECK_EQ(settings.getAsString(Settings::General_Name), "hello, world");
+    settings.set(Settings::General_MaxPlayers, 12);
+    CHECK_EQ(settings.getAsInt(Settings::General_MaxPlayers), 12);
+}
+
+TEST_CASE("settings check for exception on wrong input type") {
+    Settings settings;
+    CHECK_THROWS(settings.set(Settings::General_Debug, "hello, world"));
+    CHECK_NOTHROW(settings.set(Settings::General_Debug, false));
+}
--- a/src/TConfig.cpp
+++ b/src/TConfig.cpp
@@ -19,12 +19,15 @@
 #include "Common.h"

 #include "Env.h"
+#include "Settings.h"
 #include "TConfig.h"
 #include <cstdlib>
+#include <exception>
 #include <fstream>
 #include <iostream>
 #include <istream>
 #include <sstream>
+#include <type_traits>

 // General
 static constexpr std::string_view StrDebug = "Debug";
@@ -51,12 +54,15 @@ static constexpr std::string_view StrAuthKey = "AuthKey";
 static constexpr std::string_view EnvStrAuthKey = "BEAMMP_AUTH_KEY";
 static constexpr std::string_view StrLogChat = "LogChat";
 static constexpr std::string_view EnvStrLogChat = "BEAMMP_LOG_CHAT";
+static constexpr std::string_view StrAllowGuests = "AllowGuests";
+static constexpr std::string_view EnvStrAllowGuests = "BEAMMP_ALLOW_GUESTS";
 static constexpr std::string_view StrPassword = "Password";

 // Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
 static constexpr std::string_view StrSendErrorsMessageEnabled = "SendErrorsShowMessage";
 static constexpr std::string_view StrHideUpdateMessages = "ImScaredOfUpdates";
+static constexpr std::string_view StrUpdateReminderTime = "UpdateReminderTime";

 TEST_CASE("TConfig::TConfig") {
    const std::string CfgFile = "beammp_server_testconfig.toml";
@@ -120,35 +126,39 @@ void SetComment(CommentsT& Comments, const std::string& Comment) {
 void TConfig::FlushToFile() {
    // auto data = toml::parse<toml::preserve_comments>(mConfigFileName);
    auto data = toml::value {};
-    data["General"][StrAuthKey.data()] = Application::Settings.Key;
+    data["General"][StrAuthKey.data()] = Application::Settings.getAsString(Settings::Key::General_AuthKey);
    SetComment(data["General"][StrAuthKey.data()].comments(), " AuthKey has to be filled out in order to run the server");
-    data["General"][StrLogChat.data()] = Application::Settings.LogChat;
+    data["General"][StrLogChat.data()] = Application::Settings.getAsBool(Settings::Key::General_LogChat);
    SetComment(data["General"][StrLogChat.data()].comments(), " Whether to log chat messages in the console / log");
-    data["General"][StrDebug.data()] = Application::Settings.DebugModeEnabled;
-    data["General"][StrPrivate.data()] = Application::Settings.Private;
-    data["General"][StrPort.data()] = Application::Settings.Port;
-    data["General"][StrName.data()] = Application::Settings.ServerName;
+    data["General"][StrDebug.data()] = Application::Settings.getAsBool(Settings::Key::General_Debug);
+    data["General"][StrPrivate.data()] = Application::Settings.getAsBool(Settings::Key::General_Private);
+    data["General"][StrAllowGuests.data()] = Application::Settings.getAsBool(Settings::Key::General_AllowGuests);
+    SetComment(data["General"][StrAllowGuests.data()].comments(), " Whether to allow guests");
+    data["General"][StrPort.data()] = Application::Settings.getAsInt(Settings::Key::General_Port);
+    data["General"][StrName.data()] = Application::Settings.getAsString(Settings::Key::General_Name);
    SetComment(data["General"][StrTags.data()].comments(), " Add custom identifying tags to your server to make it easier to find. Format should be TagA,TagB,TagC. Note the comma seperation.");
-    data["General"][StrTags.data()] = Application::Settings.ServerTags;
-    data["General"][StrMaxCars.data()] = Application::Settings.MaxCars;
-    data["General"][StrMaxPlayers.data()] = Application::Settings.MaxPlayers;
-    data["General"][StrMap.data()] = Application::Settings.MapName;
-    data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
-    data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
+    data["General"][StrTags.data()] = Application::Settings.getAsString(Settings::Key::General_Tags);
+    data["General"][StrMaxCars.data()] = Application::Settings.getAsInt(Settings::Key::General_MaxCars);
+    data["General"][StrMaxPlayers.data()] = Application::Settings.getAsInt(Settings::Key::General_MaxPlayers);
+    data["General"][StrMap.data()] = Application::Settings.getAsString(Settings::Key::General_Map);
+    data["General"][StrDescription.data()] = Application::Settings.getAsString(Settings::Key::General_Description);
+    data["General"][StrResourceFolder.data()] = Application::Settings.getAsString(Settings::Key::General_ResourceFolder);
    // data["General"][StrPassword.data()] = Application::Settings.Password;
    // SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
    // Misc
-    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
+    data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.getAsBool(Settings::Key::Misc_ImScaredOfUpdates);
    SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
-    data["Misc"][StrSendErrors.data()] = Application::Settings.SendErrors;
+    data["Misc"][StrSendErrors.data()] = Application::Settings.getAsBool(Settings::Key::Misc_SendErrors);
+    data["Misc"][StrUpdateReminderTime.data()] = Application::Settings.getAsString(Settings::Key::Misc_UpdateReminderTime);
+    SetComment(data["Misc"][StrUpdateReminderTime.data()].comments(), " Specifies the time between update reminders. You can use any of \"s, min, h, d\" at the end to specify the units seconds, minutes, hours or days. So 30d or 0.5min will print the update message every 30 days or half a minute.");
    SetComment(data["Misc"][StrSendErrors.data()].comments(), " If SendErrors is `true`, the server will send helpful info about crashes and other issues back to the BeamMP developers. This info may include your config, who is on your server at the time of the error, and similar general information. This kind of data is vital in helping us diagnose and fix issues faster. This has no impact on server performance. You can opt-out of this system by setting this to `false`");
-    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.SendErrorsMessageEnabled;
+    data["Misc"][StrSendErrorsMessageEnabled.data()] = Application::Settings.getAsBool(Settings::Key::Misc_SendErrorsShowMessage);
    SetComment(data["Misc"][StrSendErrorsMessageEnabled.data()].comments(), " You can turn on/off the SendErrors message you get on startup here");
    std::stringstream Ss;
    Ss << "# This is the BeamMP-Server config file.\n"
          "# Help & Documentation: `https://docs.beammp.com/server/server-maintenance/`\n"
          "# IMPORTANT: Fill in the AuthKey with the key you got from `https://keymaster.beammp.com/` on the left under \"Keys\"\n"
-       << data;
+       << toml::format(data);
    auto File = std::fopen(mConfigFileName.c_str(), "w+");
    if (!File) {
        beammp_error("Failed to create/write to config file: " + GetPlatformAgnosticErrorString());
@@ -167,92 +177,94 @@ void TConfig::CreateConfigFile() {
    if (mDisableConfig) {
        return;
    }
-    try {
-        if (fs::exists("Server.cfg")) {
-            // parse it (this is weird and bad and should be removed in some future version)
-            ParseOldFormat();
-        }
-    } catch (const std::exception& e) {
-        beammp_error("an error occurred and was ignored during config transfer: " + std::string(e.what()));
-    }
-
    FlushToFile();
 }

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, std::string& OutValue) {
-    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            OutValue = std::string(envp);
-            return;
-        }
-    }
-    if (mDisableConfig) {
-        return;
-    }
-    if (Table[Category.c_str()][Key.data()].is_string()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_string();
-    }
-}
+// This arcane template magic is needed for using lambdas as overloaded visitors
+// See https://en.cppreference.com/w/cpp/utility/variant/visit for reference
+template <class... Ts>
+struct overloaded : Ts... {
+    using Ts::operator()...;
+};
+template <class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, bool& OutValue) {
+void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, Settings::Key key) {
    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            auto Str = std::string(envp);
-            OutValue = Str == "1" || Str == "true";
-            return;
-        }
-    }
-    if (mDisableConfig) {
-        return;
-    }
-    if (Table[Category.c_str()][Key.data()].is_boolean()) {
-        OutValue = Table[Category.c_str()][Key.data()].as_boolean();
-    }
-}
+        if (const char* envp = std::getenv(Env.data());
+            envp != nullptr && std::strcmp(envp, "") != 0) {

-void TConfig::TryReadValue(toml::value& Table, const std::string& Category, const std::string_view& Key, const std::string_view& Env, int& OutValue) {
-    if (!Env.empty()) {
-        if (const char* envp = std::getenv(Env.data()); envp != nullptr && std::strcmp(envp, "") != 0) {
-            OutValue = int(std::strtol(envp, nullptr, 10));
+            std::visit(
+                overloaded {
+                    [&envp, &key](std::string) {
+                        Application::Settings.set(key, std::string(envp));
+                    },
+                    [&envp, &key](int) {
+                        Application::Settings.set(key, int(std::strtol(envp, nullptr, 10)));
+                    },
+                    [&envp, &key](bool) {
+                        auto Str = std::string(envp);
+                        Application::Settings.set(key, bool(Str == "1" || Str == "true"));
+                    } },
+
+                Application::Settings.get(key));
            return;
        }
    }
-    if (mDisableConfig) {
-        return;
-    }
-    if (Table[Category.c_str()][Key.data()].is_integer()) {
-        OutValue = int(Table[Category.c_str()][Key.data()].as_integer());
-    }
+
+    std::visit([&Table, &Category, &Key, &key](auto&& arg) {
+        using T = std::decay_t<decltype(arg)>;
+        if constexpr (std::is_same_v<T, std::string>) {
+            if (Table[Category.c_str()][Key.data()].is_string())
+                Application::Settings.set(key, Table[Category.c_str()][Key.data()].as_string());
+            else
+                beammp_warnf("Value '{}.{}' has unexpected type, expected type 'string'", Category, Key);
+        } else if constexpr (std::is_same_v<T, int>) {
+            if (Table[Category.c_str()][Key.data()].is_integer())
+                Application::Settings.set(key, int(Table[Category.c_str()][Key.data()].as_integer()));
+            else
+                beammp_warnf("Value '{}.{}' has unexpected type, expected type 'integer'", Category, Key);
+        } else if constexpr (std::is_same_v<T, bool>) {
+            if (Table[Category.c_str()][Key.data()].is_boolean())
+                Application::Settings.set(key, Table[Category.c_str()][Key.data()].as_boolean());
+            else
+                beammp_warnf("Value '{}.{}' has unexpected type, expected type 'boolean'", Category, Key);
+        } else {
+            throw std::logic_error { "Invalid type for config value during read attempt" };
+        }
+    },
+        Application::Settings.get(key));
 }

 void TConfig::ParseFromFile(std::string_view name) {
    try {
        toml::value data {};
        if (!mDisableConfig) {
-            data = toml::parse<toml::preserve_comments>(name.data());
+            data = toml::parse(name.data());
        }
+
        // GENERAL
-        TryReadValue(data, "General", StrDebug, EnvStrDebug, Application::Settings.DebugModeEnabled);
-        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Application::Settings.Private);
-        if (Env::Get(Env::Key::PROVIDER_PORT_ENV).has_value()) {
-            TryReadValue(data, "General", StrPort, Env::Get(Env::Key::PROVIDER_PORT_ENV).value(), Application::Settings.Port);
-        } else {
-            TryReadValue(data, "General", StrPort, EnvStrPort, Application::Settings.Port);
-        }
-        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Application::Settings.MaxCars);
-        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Application::Settings.MaxPlayers);
-        TryReadValue(data, "General", StrMap, EnvStrMap, Application::Settings.MapName);
-        TryReadValue(data, "General", StrName, EnvStrName, Application::Settings.ServerName);
-        TryReadValue(data, "General", StrDescription, EnvStrDescription, Application::Settings.ServerDesc);
-        TryReadValue(data, "General", StrTags, EnvStrTags, Application::Settings.ServerTags);
-        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Application::Settings.Resource);
-        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Application::Settings.Key);
-        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Application::Settings.LogChat);
-        TryReadValue(data, "General", StrPassword, "", Application::Settings.Password);
+
+        // Read into new Settings Singleton
+        TryReadValue(data, "General", StrDebug, EnvStrDebug, Settings::Key::General_Debug);
+        TryReadValue(data, "General", StrPrivate, EnvStrPrivate, Settings::Key::General_Private);
+        TryReadValue(data, "General", StrPort, EnvStrPort, Settings::Key::General_Port);
+        TryReadValue(data, "General", StrMaxCars, EnvStrMaxCars, Settings::Key::General_MaxCars);
+        TryReadValue(data, "General", StrMaxPlayers, EnvStrMaxPlayers, Settings::Key::General_MaxPlayers);
+        TryReadValue(data, "General", StrMap, EnvStrMap, Settings::Key::General_Map);
+        TryReadValue(data, "General", StrName, EnvStrName, Settings::Key::General_Name);
+        TryReadValue(data, "General", StrDescription, EnvStrDescription, Settings::Key::General_Description);
+        TryReadValue(data, "General", StrTags, EnvStrTags, Settings::Key::General_Tags);
+        TryReadValue(data, "General", StrResourceFolder, EnvStrResourceFolder, Settings::Key::General_ResourceFolder);
+        TryReadValue(data, "General", StrAuthKey, EnvStrAuthKey, Settings::Key::General_AuthKey);
+        TryReadValue(data, "General", StrLogChat, EnvStrLogChat, Settings::Key::General_LogChat);
+        TryReadValue(data, "General", StrAllowGuests, EnvStrAllowGuests, Settings::Key::General_AllowGuests);
        // Misc
-        TryReadValue(data, "Misc", StrSendErrors, "", Application::Settings.SendErrors);
-        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Application::Settings.HideUpdateMessages);
-        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Application::Settings.SendErrorsMessageEnabled);
+        TryReadValue(data, "Misc", StrSendErrors, "", Settings::Key::Misc_SendErrors);
+        TryReadValue(data, "Misc", StrHideUpdateMessages, "", Settings::Key::Misc_ImScaredOfUpdates);
+        TryReadValue(data, "Misc", StrSendErrorsMessageEnabled, "", Settings::Key::Misc_SendErrorsShowMessage);
+        TryReadValue(data, "Misc", StrUpdateReminderTime, "", Settings::Key::Misc_UpdateReminderTime);
+
    } catch (const std::exception& err) {
        beammp_error("Error parsing config file value: " + std::string(err.what()));
        mFailed = true;
@@ -265,7 +277,7 @@ void TConfig::ParseFromFile(std::string_view name) {
        FlushToFile();
    }
    // all good so far, let's check if there's a key
-    if (Application::Settings.Key.empty()) {
+    if (Application::Settings.getAsString(Settings::Key::General_AuthKey).empty()) {
        if (mDisableConfig) {
            beammp_error("No AuthKey specified in the environment.");
        } else {
@@ -276,7 +288,7 @@ void TConfig::ParseFromFile(std::string_view name) {
        return;
    }
    Application::SetSubsystemStatus("Config", Application::Status::Good);
-    if (Application::Settings.Key.size() != 36) {
+    if (Application::Settings.getAsString(Settings::Key::General_AuthKey).size() != 36) {
        beammp_warn("AuthKey specified is the wrong length and likely isn't valid.");
    }
 }
@@ -285,77 +297,25 @@ void TConfig::PrintDebug() {
    if (mDisableConfig) {
        beammp_debug("Provider turned off the generation and parsing of the ServerConfig.toml");
    }
-    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
-    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
-    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.Port));
-    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.MaxCars));
-    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.MaxPlayers));
-    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.MapName + "\"");
-    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.ServerName + "\"");
-    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.ServerDesc + "\"");
+    beammp_debug(std::string(StrDebug) + ": " + std::string(Application::Settings.getAsBool(Settings::Key::General_Debug) ? "true" : "false"));
+    beammp_debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.getAsBool(Settings::Key::General_Private) ? "true" : "false"));
+    beammp_debug(std::string(StrPort) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)));
+    beammp_debug(std::string(StrMaxCars) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxCars)));
+    beammp_debug(std::string(StrMaxPlayers) + ": " + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)));
+    beammp_debug(std::string(StrMap) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Map) + "\"");
+    beammp_debug(std::string(StrName) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Name) + "\"");
+    beammp_debug(std::string(StrDescription) + ": \"" + Application::Settings.getAsString(Settings::Key::General_Description) + "\"");
    beammp_debug(std::string(StrTags) + ": " + TagsAsPrettyArray());
-    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.LogChat ? "true" : "false") + "\"");
-    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.Resource + "\"");
+    beammp_debug(std::string(StrLogChat) + ": \"" + (Application::Settings.getAsBool(Settings::Key::General_LogChat) ? "true" : "false") + "\"");
+    beammp_debug(std::string(StrResourceFolder) + ": \"" + Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "\"");
+    beammp_debug(std::string(StrAllowGuests) + ": \"" + (Application::Settings.getAsBool(Settings::Key::General_AllowGuests) ? "true" : "false") + "\"");
    // special!
-    beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
-    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
+    beammp_debug("Key Length: " + std::to_string(Application::Settings.getAsString(Settings::Key::General_AuthKey).length()) + "");
 }

-void TConfig::ParseOldFormat() {
-    std::ifstream File("Server.cfg");
-    // read all, strip comments
-    std::string Content;
-    for (;;) {
-        std::string Line;
-        std::getline(File, Line);
-        if (!Line.empty() && Line.at(0) != '#') {
-            Line = Line.substr(0, Line.find_first_of('#'));
-            Content += Line + "\n";
-        }
-        if (!File.good()) {
-            break;
-        }
-    }
-    std::stringstream Str(Content);
-    std::string Key, Ignore, Value;
-    for (;;) {
-        Str >> Key >> std::ws >> Ignore >> std::ws;
-        std::getline(Str, Value);
-        if (Str.eof()) {
-            break;
-        }
-        std::stringstream ValueStream(Value);
-        ValueStream >> std::ws; // strip leading whitespace if any
-        Value = ValueStream.str();
-        if (Key == "Debug") {
-            Application::Settings.DebugModeEnabled = Value.find("true") != std::string::npos;
-        } else if (Key == "Private") {
-            Application::Settings.Private = Value.find("true") != std::string::npos;
-        } else if (Key == "Port") {
-            ValueStream >> Application::Settings.Port;
-        } else if (Key == "Cars") {
-            ValueStream >> Application::Settings.MaxCars;
-        } else if (Key == "MaxPlayers") {
-            ValueStream >> Application::Settings.MaxPlayers;
-        } else if (Key == "Map") {
-            Application::Settings.MapName = Value.substr(1, Value.size() - 3);
-        } else if (Key == "Name") {
-            Application::Settings.ServerName = Value.substr(1, Value.size() - 3);
-        } else if (Key == "Desc") {
-            Application::Settings.ServerDesc = Value.substr(1, Value.size() - 3);
-        } else if (Key == "use") {
-            Application::Settings.Resource = Value.substr(1, Value.size() - 3);
-        } else if (Key == "AuthKey") {
-            Application::Settings.Key = Value.substr(1, Value.size() - 3);
-        } else {
-            beammp_warn("unknown key in old auth file (ignored): " + Key);
-        }
-        Str >> std::ws;
-    }
-}
 std::string TConfig::TagsAsPrettyArray() const {
    std::vector<std::string> TagsArray = {};
-    SplitString(Application::Settings.ServerTags, ',', TagsArray);
+    SplitString(Application::Settings.getAsString(Settings::General_Tags), ',', TagsArray);
    std::string Pretty = {};
    for (size_t i = 0; i < TagsArray.size() - 1; ++i) {
        Pretty += '\"' + TagsArray[i] + "\", ";
--- a/src/TConsole.cpp
+++ b/src/TConsole.cpp
@@ -26,8 +26,12 @@
 #include "TLuaEngine.h"

 #include <ctime>
+#include <lua.hpp>
 #include <mutex>
+#include <openssl/opensslv.h>
 #include <sstream>
+#include <stdexcept>
+#include <unordered_map>

 static inline bool StringStartsWith(const std::string& What, const std::string& StartsWith) {
    return What.size() >= StartsWith.size() && What.substr(0, StartsWith.size()) == StartsWith;
@@ -76,7 +80,7 @@ static std::string GetDate() {
    auto local_tm = std::localtime(&tt);
    char buf[30];
    std::string date;
-    if (Application::Settings.DebugModeEnabled) {
+    if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {
        std::strftime(buf, sizeof(buf), "[%d/%m/%y %T.", local_tm);
        date += buf;
        auto seconds = std::chrono::time_point_cast<std::chrono::seconds>(now);
@@ -104,41 +108,6 @@ void TConsole::BackupOldLog() {
        } catch (const std::exception& e) {
            beammp_warn(e.what());
        }
-        /*
-        int err = 0;
-        zip* z = zip_open("ServerLogs.zip", ZIP_CREATE, &err);
-        if (!z) {
-            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
-            return;
-        }
-        FILE* File = std::fopen(Path.string().c_str(), "r");
-        if (!File) {
-            std::cerr << GetPlatformAgnosticErrorString() << std::endl;
-            return;
-        }
-        std::vector<uint8_t> Buffer;
-        Buffer.resize(fs::file_size(Path));
-        std::fread(Buffer.data(), 1, Buffer.size(), File);
-        std::fclose(File);
-
-        auto s = zip_source_buffer(z, Buffer.data(), Buffer.size(), 0);
-
-        auto TimePoint = fs::last_write_time(Path);
-        auto Secs = TimePoint.time_since_epoch().count();
-        auto MyTimeT = std::time(&Secs);
-
-        std::string NewName = Path.stem().string();
-        NewName += "_";
-        std::string Time;
-        Time.resize(32);
-        size_t n = strftime(Time.data(), Time.size(), "%F_%H.%M.%S", localtime(&MyTimeT));
-        Time.resize(n);
-        NewName += Time;
-        NewName += ".log";
-
-        zip_file_add(z, NewName.c_str(), s, 0);
-        zip_close(z);
-    */
    }
 }

@@ -273,7 +242,25 @@ void TConsole::Command_Version(const std::string& cmd, const std::vector<std::st
        return;
    }

-    Application::Console().WriteRaw("Current version: v" + Application::ServerVersionString());
+    std::string platform;
+#if defined(BEAMMP_WINDOWS)
+    platform = "Windows";
+#elif defined(BEAMMP_LINUX)
+    platform = "Linux";
+#elif defined(BEAMMP_FREEBSD)
+    platform = "FreeBSD";
+#elif defined(BEAMMP_APPLE)
+    platform = "Apple";
+#else
+    platform = "Unknown";
+#endif
+
+    Application::Console().WriteRaw("Platform: " + platform);
+    Application::Console().WriteRaw("Server:   v" + Application::ServerVersionString());
+    std::string lua_version = fmt::format("Lua:      v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
+    Application::Console().WriteRaw(lua_version);
+    std::string openssl_version = fmt::format("OpenSSL:  v{}.{}.{}", OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH);
+    Application::Console().WriteRaw(openssl_version);
 }

 void TConsole::Command_Kick(const std::string&, const std::vector<std::string>& args) {
@@ -366,8 +353,142 @@ std::tuple<std::string, std::vector<std::string>> TConsole::ParseCommand(const s
    return { Command, Args };
 }

+template <class... Ts>
+struct overloaded : Ts... {
+    using Ts::operator()...;
+};
+template <class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
+
 void TConsole::Command_Settings(const std::string&, const std::vector<std::string>& args) {
-    if (!EnsureArgsCount(args, 1, 2)) {
+
+    static constexpr const char* sHelpString = R"(
+    Settings:
+        settings help                               displays this help
+        settings list                               lists all settings
+        settings get <category> <setting>           prints current value of specified setting
+        settings set <category> <setting> <value>   sets specified setting to value
+        )";
+
+    if (args.size() == 0) {
+        beammp_errorf("No arguments specified for command 'settings'!");
+        Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
+        return;
+    }
+
+    if (args.front() == "help") {
+
+        Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
+        return;
+    } else if (args.front() == "get") {
+        if (args.size() < 3) {
+            beammp_errorf("'settings get' needs at least two arguments!");
+
+            Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
+            return;
+        }
+
+        try {
+            Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) });
+            Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
+
+            std::visit(
+                overloaded {
+                    [&args](std::string keyValue) {
+                        Application::Console().WriteRaw(fmt::format("'{}::{}' = {}", args.at(1), args.at(2), keyValue));
+                    },
+                    [&args](int keyValue) {
+                        Application::Console().WriteRaw(fmt::format("'{}::{}' = {}", args.at(1), args.at(2), keyValue));
+                    },
+                    [&args](bool keyValue) {
+                        Application::Console().WriteRaw(fmt::format("'{}::{}' = {}", args.at(1), args.at(2), keyValue));
+                    }
+
+                },
+                keyType);
+
+        } catch (std::logic_error& e) {
+            beammp_errorf("Error when getting key: {}", e.what());
+            return;
+        }
+    } else if (args.front() == "set") {
+        if (args.size() <= 3) {
+            beammp_errorf("'settings set' needs at least three arguments!");
+
+            Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
+            return;
+        }
+
+        try {
+
+            Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) });
+            Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
+
+            std::visit(
+                overloaded {
+                    [&args](std::string keyValue) {
+                        Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, std::string(args.at(3)));
+                        Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::string(args.at(3))));
+                    },
+                    [&args](int keyValue) {
+                        Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, std::stoi(args.at(3)));
+                        Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), std::stoi(args.at(3))));
+                    },
+                    [&args](bool keyValue) {
+                        if (args.at(3) == "true") {
+                            Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, true);
+                            Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "true"));
+                        } else if (args.at(3) == "false") {
+                            Application::Settings.setConsoleInputAccessMapping(ComposedKey { args.at(1), args.at(2) }, false);
+                            Application::Console().WriteRaw(fmt::format("{}::{} := {}", args.at(1), args.at(2), "false"));
+                        } else {
+                            beammp_errorf("Error when setting key: {}::{} : Unknown literal, use either 'true', or 'false' to set boolean values.", args.at(1), args.at(2));
+                        }
+                    }
+
+                },
+                keyType);
+
+        } catch (std::logic_error& e) {
+            beammp_errorf("Exception when setting settings key via console: {}", e.what());
+            return;
+        }
+
+    } else if (args.front() == "list") {
+        for (const auto& [composedKey, keyACL] : Application::Settings.getAccessControlMap()) {
+            // even though we have the value, we want to ignore it in order to make use of access
+            // control checks
+
+            if (keyACL.second != Settings::SettingsAccessMask::NO_ACCESS) {
+
+                try {
+
+                    Settings::SettingsAccessControl acl = Application::Settings.getConsoleInputAccessMapping(composedKey);
+                    Settings::SettingsTypeVariant keyType = Application::Settings.get(acl.first);
+
+                    std::visit(
+                        overloaded {
+                            [&composedKey](std::string keyValue) {
+                                Application::Console().WriteRaw(fmt::format("{} = {}", composedKey, keyValue));
+                            },
+                            [&composedKey](int keyValue) {
+                                Application::Console().WriteRaw(fmt::format("{} = {}", composedKey, keyValue));
+                            },
+                            [&composedKey](bool keyValue) {
+                                Application::Console().WriteRaw(fmt::format("{} = {}", composedKey, keyValue));
+                            }
+
+                        },
+                        keyType);
+                } catch (std::logic_error& e) {
+                    beammp_errorf("Error when getting key: {}", e.what());
+                }
+            }
+        }
+    } else {
+        beammp_errorf("Unknown argument for command 'settings': {}", args.front());
+
+        Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
        return;
    }
 }
@@ -376,7 +497,7 @@ void TConsole::Command_Say(const std::string& FullCmd) {
    if (FullCmd.size() > 3) {
        auto Message = FullCmd.substr(4);
        LuaAPI::MP::SendChatMessage(-1, Message);
-        if (!Application::Settings.LogChat) {
+        if (!Application::Settings.getAsBool(Settings::Key::General_LogChat)) {
            Application::Console().WriteRaw("Chat message sent!");
        }
    }
@@ -422,7 +543,7 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
        if (!Client.expired()) {
            auto Locked = Client.lock();
            CarCount += Locked->GetCarCount();
-            ConnectedCount += Locked->IsConnected() ? 1 : 0;
+            ConnectedCount += Locked->IsUDPConnected() ? 1 : 0;
            GuestCount += Locked->IsGuest() ? 1 : 0;
            SyncedCount += Locked->IsSynced() ? 1 : 0;
            SyncingCount += Locked->IsSyncing() ? 1 : 0;
--- a/src/THeartbeatThread.cpp
+++ b/src/THeartbeatThread.cpp
@@ -18,9 +18,10 @@

 #include "THeartbeatThread.h"

+#include "ChronoWrapper.h"
 #include "Client.h"
 #include "Http.h"
-//#include "SocketIO.h"
+// #include "SocketIO.h"
 #include <rapidjson/document.h>
 #include <rapidjson/rapidjson.h>
 #include <sstream>
@@ -36,15 +37,17 @@ void THeartbeatThread::operator()() {
    static std::string Last;

    static std::chrono::high_resolution_clock::time_point LastNormalUpdateTime = std::chrono::high_resolution_clock::now();
+    static std::chrono::high_resolution_clock::time_point LastUpdateReminderTime = std::chrono::high_resolution_clock::now();
    bool isAuth = false;
-    size_t UpdateReminderCounter = 0;
+    std::chrono::high_resolution_clock::duration UpdateReminderTimePassed;
    while (!Application::IsShuttingDown()) {
-        ++UpdateReminderCounter;
+        auto UpdateReminderTimeout = ChronoWrapper::TimeFromStringWithLiteral(Application::Settings.getAsString(Settings::Key::Misc_UpdateReminderTime));
        Body = GenerateCall();
        // a hot-change occurs when a setting has changed, to update the backend of that change.
        auto Now = std::chrono::high_resolution_clock::now();
        bool Unchanged = Last == Body;
        auto TimePassed = (Now - LastNormalUpdateTime);
+        UpdateReminderTimePassed = (Now - LastUpdateReminderTime);
        auto Threshold = Unchanged ? 30 : 5;
        if (TimePassed < std::chrono::seconds(Threshold)) {
            std::this_thread::sleep_for(std::chrono::milliseconds(100));
@@ -54,9 +57,6 @@ void THeartbeatThread::operator()() {

        Last = Body;
        LastNormalUpdateTime = Now;
-        if (!Application::Settings.CustomIP.empty()) {
-            Body += "&ip=" + Application::Settings.CustomIP;
-        }

        auto Target = "/heartbeat";
        unsigned int ResponseCode = 0;
@@ -67,7 +67,7 @@ void THeartbeatThread::operator()() {
            T = Http::POST(Url, 443, Target, Body, "application/x-www-form-urlencoded", &ResponseCode, { { "api-v", "2" } });
            Doc.Parse(T.data(), T.size());
            if (Doc.HasParseError() || !Doc.IsObject()) {
-                if (!Application::Settings.Private) {
+                if (!Application::Settings.getAsBool(Settings::Key::General_Private)) {
                    beammp_trace("Backend response failed to parse as valid json");
                    beammp_trace("Response was: `" + T + "`");
                }
@@ -107,12 +107,12 @@ void THeartbeatThread::operator()() {
                beammp_error("Missing/invalid json members in backend response");
            }
        } else {
-            if (!Application::Settings.Private) {
+            if (!Application::Settings.getAsBool(Settings::Key::General_Private)) {
                beammp_warn("Backend failed to respond to a heartbeat. Your server may temporarily disappear from the server list. This is not an error, and will likely resolve itself soon. Direct connect will still work.");
            }
        }

-        if (Ok && !isAuth && !Application::Settings.Private) {
+        if (Ok && !isAuth && !Application::Settings.getAsBool(Settings::Key::General_Private)) {
            if (Status == "2000") {
                beammp_info(("Authenticated! " + Message));
                isAuth = true;
@@ -126,10 +126,11 @@ void THeartbeatThread::operator()() {
                beammp_error("Backend REFUSED the auth key. Reason: " + Message);
            }
        }
-        if (isAuth || Application::Settings.Private) {
+        if (isAuth || Application::Settings.getAsBool(Settings::Key::General_Private)) {
            Application::SetSubsystemStatus("Heartbeat", Application::Status::Good);
        }
-        if (!Application::Settings.HideUpdateMessages && UpdateReminderCounter % 5) {
+        if (!Application::Settings.getAsBool(Settings::Key::Misc_ImScaredOfUpdates) && UpdateReminderTimePassed.count() > UpdateReminderTimeout.count()) {
+            LastUpdateReminderTime = std::chrono::high_resolution_clock::now();
            Application::CheckForUpdates();
        }
    }
@@ -138,22 +139,22 @@ void THeartbeatThread::operator()() {
 std::string THeartbeatThread::GenerateCall() {
    std::stringstream Ret;

-    Ret << "uuid=" << Application::Settings.Key
+    Ret << "uuid=" << Application::Settings.getAsString(Settings::Key::General_AuthKey)
        << "&players=" << mServer.ClientCount()
-        << "&maxplayers=" << Application::Settings.MaxPlayers
-        << "&port=" << Application::Settings.Port
-        << "&map=" << Application::Settings.MapName
-        << "&private=" << (Application::Settings.Private ? "true" : "false")
+        << "&maxplayers=" << Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)
+        << "&port=" << Application::Settings.getAsInt(Settings::Key::General_Port)
+        << "&map=" << Application::Settings.getAsString(Settings::Key::General_Map)
+        << "&private=" << (Application::Settings.getAsBool(Settings::Key::General_Private) ? "true" : "false")
        << "&version=" << Application::ServerVersionString()
        << "&clientversion=" << std::to_string(Application::ClientMajorVersion()) + ".0" // FIXME: Wtf.
-        << "&name=" << Application::Settings.ServerName
-        << "&tags=" << Application::Settings.ServerTags
+        << "&name=" << Application::Settings.getAsString(Settings::Key::General_Name)
+        << "&tags=" << Application::Settings.getAsString(Settings::Key::General_Tags)
+        << "&guests=" << (Application::Settings.getAsBool(Settings::Key::General_AllowGuests) ? "true" : "false")
        << "&modlist=" << mResourceManager.TrimmedList()
        << "&modstotalsize=" << mResourceManager.MaxModSize()
        << "&modstotal=" << mResourceManager.ModsLoaded()
        << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc
-        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
+        << "&desc=" << Application::Settings.getAsString(Settings::Key::General_Description);
    return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)
--- a/src/TLuaEngine.cpp
+++ b/src/TLuaEngine.cpp
@@ -30,18 +30,34 @@
 #include <condition_variable>
 #include <fmt/core.h>
 #include <nlohmann/json.hpp>
+#include <optional>
 #include <random>
+#include <sol/stack_core.hpp>
 #include <thread>
 #include <tuple>

 TLuaEngine* LuaAPI::MP::Engine;

+static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn);
+
+static std::optional<sol::function> GetLuaHandler(sol::state_view StateView, const std::string Handler, const std::string EventName);
+
+static std::optional<sol::function> GetLuaHandler(sol::state_view StateView, const std::string Handler, const std::string EventName) {
+    auto Res = StateView.safe_script("return " + Handler, sol::script_pass_on_error);
+    if (!Res.valid()) {
+        beammp_errorf("invalid handler for event \"{}\". handler: \"{}\"", EventName, Handler);
+    } else if (Res.get_type() == sol::type::function) {
+        return Res.get<sol::function>();
+    }
+    return std::nullopt;
+}
+
 TLuaEngine::TLuaEngine()
-    : mResourceServerPath(fs::path(Application::Settings.Resource) / "Server") {
+    : mResourceServerPath(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server") {
    Application::SetSubsystemStatus("LuaEngine", Application::Status::Starting);
    LuaAPI::MP::Engine = this;
-    if (!fs::exists(Application::Settings.Resource)) {
-        fs::create_directory(Application::Settings.Resource);
+    if (!fs::exists(Application::Settings.getAsString(Settings::Key::General_ResourceFolder))) {
+        fs::create_directory(Application::Settings.getAsString(Settings::Key::General_ResourceFolder));
    }
    if (!fs::exists(mResourceServerPath)) {
        fs::create_directory(mResourceServerPath);
@@ -57,7 +73,7 @@ TLuaEngine::TLuaEngine()
 }

 TEST_CASE("TLuaEngine ctor & dtor") {
-    Application::Settings.Resource = "beammp_server_test_resources";
+    Application::Settings.set(Settings::Key::General_ResourceFolder, "beammp_server_test_resources");
    TLuaEngine engine;
    Application::GracefullyShutdown();
 }
@@ -66,6 +82,7 @@ void TLuaEngine::operator()() {
    RegisterThread("LuaEngine");
    Application::SetSubsystemStatus("LuaEngine", Application::Status::Good);
    // lua engine main thread
+    beammp_infof("Lua v{}.{}.{}", LUA_VERSION_MAJOR, LUA_VERSION_MINOR, LUA_VERSION_RELEASE);
    CollectAndInitPlugins();
    // now call all onInit's
    auto Futures = TriggerEvent("onInit", "");
@@ -268,7 +285,7 @@ std::vector<std::string> TLuaEngine::StateThreadData::GetStateTableKeys(const st

    for (size_t i = 0; i < keys.size(); ++i) {
        auto obj = current.get<sol::object>(keys.at(i));
-        if (obj.get_type() == sol::type::nil) {
+        if (obj.get_type() == sol::type::lua_nil) {
            // error
            break;
        } else if (i == keys.size() - 1) {
@@ -353,9 +370,9 @@ std::shared_ptr<TLuaResult> TLuaEngine::EnqueueScript(TLuaStateId StateID, const
    return mLuaStates.at(StateID)->EnqueueScript(Script);
 }

-std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::EnqueueFunctionCall(TLuaStateId StateID, const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName) {
    std::unique_lock Lock(mLuaStatesMutex);
-    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args);
+    return mLuaStates.at(StateID)->EnqueueFunctionCall(FunctionName, Args, EventName);
 }

 void TLuaEngine::CollectAndInitPlugins() {
@@ -428,7 +445,7 @@ void TLuaEngine::EnsureStateExists(TLuaStateId StateId, const std::string& Name,
        mLuaStates[StateId] = std::move(DataPtr);
        RegisterEvent("onInit", StateId, "onInit");
        if (!DontCallOnInit) {
-            auto Res = EnqueueFunctionCall(StateId, "onInit", {});
+            auto Res = EnqueueFunctionCall(StateId, "onInit", {}, "onInit");
            Res->WaitUntilReady();
            if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
                beammp_lua_error("Calling \"onInit\" on \"" + StateId + "\" failed: " + Res->ErrorMessage);
@@ -458,7 +475,8 @@ std::vector<sol::object> TLuaEngine::StateThreadData::JsonStringToArray(JsonStri

 sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
    auto Table = mStateView.create_table();
-    for (const sol::stack_proxy& Arg : EventArgs) {
+    int i = 1;
+    for (auto Arg : EventArgs) {
        switch (Arg.get_type()) {
        case sol::type::none:
        case sol::type::userdata:
@@ -466,19 +484,20 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
        case sol::type::thread:
        case sol::type::function:
        case sol::type::poly:
-            Table.add(BEAMMP_INTERNAL_NIL);
+            Table.set(i, BEAMMP_INTERNAL_NIL);
            beammp_warnf("Passed a value of type '{}' to TriggerGlobalEvent(\"{}\", ...). This type can not be serialized, and cannot be passed between states. It will arrive as <nil> in handlers.", sol::type_name(EventArgs.lua_state(), Arg.get_type()), EventName);
            break;
        case sol::type::lua_nil:
-            Table.add(BEAMMP_INTERNAL_NIL);
+            Table.set(i, BEAMMP_INTERNAL_NIL);
            break;
        case sol::type::string:
        case sol::type::number:
        case sol::type::boolean:
        case sol::type::table:
-            Table.add(Arg);
+            Table.set(i, Arg);
            break;
        }
+        ++i;
    }
    JsonString Str { LuaAPI::MP::JsonEncode(Table) };
    beammp_debugf("json: {}", Str.value);
@@ -487,8 +506,11 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string

    sol::variadic_results LocalArgs = JsonStringToArray(Str);
    for (const auto& Handler : MyHandlers) {
-        auto Fn = mStateView[Handler];
-        if (Fn.valid()) {
+        auto Res = GetLuaHandler(mStateView, Handler, EventName);
+        if (Res.has_value()) {
+            sol::function Fn = Res.value();
+            Fn = AddTraceback(mStateView, Fn);
+
            auto LuaResult = Fn(LocalArgs);
            auto Result = std::make_shared<TLuaResult>();
            if (LuaResult.valid()) {
@@ -496,7 +518,9 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                Result->Result = LuaResult;
            } else {
                Result->Error = true;
-                Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
+                sol::error Err = LuaResult;
+                Result->ErrorMessage = Err.what();
+                beammp_errorf("An error occured while executing local event handler \"{}\" for event \"{}\": {}", Handler, EventName, Result->ErrorMessage);
            }
            Result->MarkAsReady();
            Return.push_back(Result);
@@ -520,11 +544,13 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
            sol::state_view StateView(mState);
            sol::table Result = StateView.create_table();
            auto Vector = Self.get<std::vector<std::shared_ptr<TLuaResult>>>("ReturnValueImpl");
+            int i = 1;
            for (const auto& Value : Vector) {
                if (!Value->Ready) {
                    return sol::lua_nil;
                }
-                Result.add(Value->Result);
+                Result.set(i, Value->Result);
+                ++i;
            }
            return Result;
        });
@@ -534,12 +560,15 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
 sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
    // TODO: make asynchronous?
    sol::table Result = mStateView.create_table();
+    int i = 1;
    for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
-        auto Fn = mStateView[Handler];
-        if (Fn.valid() && Fn.get_type() == sol::type::function) {
+        auto Res = GetLuaHandler(mStateView, Handler, EventName);
+        if (Res.has_value()) {
+            sol::function Fn = Res.value();
            auto FnRet = Fn(EventArgs);
            if (FnRet.valid()) {
-                Result.add(FnRet);
+                Result.set(i, FnRet);
+                ++i;
            } else {
                sol::error Err = FnRet;
                beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
@@ -566,6 +595,16 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
    }
 }

+std::variant<std::string, sol::nil_t> TLuaEngine::StateThreadData::Lua_GetPlayerRole(int ID) {
+    auto MaybeClient = GetClient(mEngine->Server(), ID);
+    if (MaybeClient) {
+        return MaybeClient.value().lock()->GetRoles();
+    } else {
+        return sol::nil;
+    }
+}
+
+
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
    sol::table Result = mStateView.create_table();
    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
@@ -840,6 +879,15 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
        return Lua_GetPositionRaw(PID, VID);
    });
    MPTable.set_function("SendChatMessage", &LuaAPI::MP::SendChatMessage);
+    MPTable.set_function("SendNotification", [&](sol::variadic_args Args) {
+        if (Args.size() == 3) {
+            LuaAPI::MP::SendNotification(Args.get<int>(0), Args.get<std::string>(1), Args.get<std::string>(2), Args.get<std::string>(1));
+        } else if (Args.size() == 4) {
+            LuaAPI::MP::SendNotification(Args.get<int>(0), Args.get<std::string>(1), Args.get<std::string>(2), Args.get<std::string>(3));
+        } else {
+            beammp_lua_error("SendNotification expects 2 or 3 arguments.");
+        }
+    });
    MPTable.set_function("GetPlayers", [&]() -> sol::table {
        return Lua_GetPlayers();
    });
@@ -854,6 +902,9 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
    MPTable.set_function("GetPlayerIdentifiers", [&](int ID) -> sol::table {
        return Lua_GetPlayerIdentifiers(ID);
    });
+    MPTable.set_function("GetPlayerRole", [&](int ID) -> std::variant<std::string, sol::nil_t> {
+        return Lua_GetPlayerRole(ID);
+    });
    MPTable.set_function("Sleep", &LuaAPI::MP::Sleep);
    //  const std::string& EventName, size_t IntervalMS, int strategy
    MPTable.set_function("CreateEventTimer", [&](sol::variadic_args Args) {
@@ -881,6 +932,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
        mEngine->CancelEventTimers(EventName, mStateId);
    });
    MPTable.set_function("Set", &LuaAPI::MP::Set);
+    MPTable.set_function("Get", &LuaAPI::MP::Get);

    auto UtilTable = StateView.create_named_table("Util");
    UtilTable.set_function("LogDebug", [this](sol::variadic_args args) {
@@ -889,7 +941,7 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
            ToPrint += LuaAPI::LuaToString(static_cast<const sol::object>(arg));
            ToPrint += "\t";
        }
-        if (Application::Settings.DebugModeEnabled) {
+        if (Application::Settings.getAsBool(Settings::Key::General_Debug)) {
            beammp_lua_log("DEBUG", mStateId, ToPrint);
        }
    });
@@ -1028,12 +1080,12 @@ std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCallFrom
    }
 }

-std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args) {
+std::shared_ptr<TLuaResult> TLuaEngine::StateThreadData::EnqueueFunctionCall(const std::string& FunctionName, const std::vector<TLuaValue>& Args, const std::string& EventName) {
    auto Result = std::make_shared<TLuaResult>();
    Result->StateId = mStateId;
    Result->Function = FunctionName;
    std::unique_lock Lock(mStateFunctionQueueMutex);
-    mStateFunctionQueue.push_back({ FunctionName, Result, Args, "" });
+    mStateFunctionQueue.push_back({ FunctionName, Result, Args, EventName });
    mStateFunctionQueueCond.notify_all();
    return Result;
 }
@@ -1042,6 +1094,21 @@ void TLuaEngine::StateThreadData::RegisterEvent(const std::string& EventName, co
    mEngine->RegisterEvent(EventName, mStateId, FunctionName);
 }

+static sol::protected_function AddTraceback(sol::state_view StateView, sol::protected_function RawFn) {
+    StateView["INTERNAL_ERROR_HANDLER"] = [](lua_State *L) {
+        auto Error = sol::stack::get<std::optional<std::string>>(L);
+        std::string ErrorString = "<Unknown error>";
+        if (Error.has_value()) {
+            ErrorString = Error.value();
+        }
+        auto DebugTracebackFn = sol::state_view(L).globals().get<sol::table>("debug").get<sol::protected_function>("traceback");
+        // 2 = start collecting the trace one above the current function (1=current function)
+        std::string Traceback = DebugTracebackFn(ErrorString, 2);
+        return sol::stack::push(L, Traceback);
+    };
+    return sol::protected_function(RawFn, StateView["INTERNAL_ERROR_HANDLER"]);
+}
+
 void TLuaEngine::StateThreadData::operator()() {
    RegisterThread("Lua:" + mStateId);
    while (!Application::IsShuttingDown()) {
@@ -1106,8 +1173,10 @@ void TLuaEngine::StateThreadData::operator()() {
                // TODO: Use TheQueuedFunction.EventName for errors, warnings, etc
                Result->StateId = mStateId;
                sol::state_view StateView(mState);
-                auto Fn = StateView[FnName];
-                if (Fn.valid() && Fn.get_type() == sol::type::function) {
+
+                auto Res = GetLuaHandler(StateView, FnName, TheQueuedFunction.EventName);
+                if (Res.has_value()) {
+                    sol::function Fn = Res.value();
                    std::vector<sol::object> LuaArgs;
                    for (const auto& Arg : Args) {
                        if (Arg.valueless_by_exception()) {
@@ -1128,7 +1197,7 @@ void TLuaEngine::StateThreadData::operator()() {
                        case TLuaType::Bool:
                            LuaArgs.push_back(sol::make_object(StateView, std::get<bool>(Arg)));
                            break;
-                         case TLuaType::StringStringMap: {
+                        case TLuaType::StringStringMap: {
                            auto Map = std::get<std::unordered_map<std::string, std::string>>(Arg);
                            auto Table = StateView.create_table();
                            for (const auto& [k, v] : Map) {
@@ -1142,6 +1211,7 @@ void TLuaEngine::StateThreadData::operator()() {
                            break;
                        }
                    }
+                    Fn = AddTraceback(StateView, Fn);
                    auto Res = Fn(sol::as_args(LuaArgs));
                    if (Res.valid()) {
                        Result->Error = false;
--- a/src/TNetwork.cpp
+++ b/src/TNetwork.cpp
@@ -21,13 +21,17 @@
 #include "Common.h"
 #include "LuaAPI.h"
 #include "TLuaEngine.h"
+#include "TScopedTimer.h"
 #include "nlohmann/json.hpp"
 #include <CustomAssert.h>
 #include <Http.h>
 #include <array>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/address_v4.hpp>
+#include <boost/asio/ip/address_v6.hpp>
+#include <boost/asio/ip/v6_only.hpp>
 #include <cstring>
+#include <zlib.h>

 typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;

@@ -80,7 +84,8 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R

 void TNetwork::UDPServerMain() {
    RegisterThread("UDPServer");
-    ip::udp::endpoint UdpListenEndpoint(ip::address::from_string("0.0.0.0"), Application::Settings.Port);
+    // listen on all ipv6 addresses
+    ip::udp::endpoint UdpListenEndpoint(ip::address::from_string("::"), Application::Settings.getAsInt(Settings::Key::General_Port));
    boost::system::error_code ec;
    mUDPSock.open(UdpListenEndpoint.protocol(), ec);
    if (ec) {
@@ -88,6 +93,12 @@ void TNetwork::UDPServerMain() {
        std::this_thread::sleep_for(std::chrono::seconds(5));
        Application::GracefullyShutdown();
    }
+    // set IP_V6ONLY to false to allow both v4 and v6
+    boost::asio::ip::v6_only option(false);
+    mUDPSock.set_option(option, ec);
+    if (ec) {
+        beammp_warnf("Failed to unset IP_V6ONLY on UDP, only IPv6 will work: {}", ec.message());
+    }
    mUDPSock.bind(UdpListenEndpoint, ec);
    if (ec) {
        beammp_error("bind() failed: " + ec.message());
@@ -95,12 +106,12 @@ void TNetwork::UDPServerMain() {
        Application::GracefullyShutdown();
    }
    Application::SetSubsystemStatus("UDPNetwork", Application::Status::Good);
-    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.Port) + (" with a Max of ")
-        + std::to_string(Application::Settings.MaxPlayers) + (" Clients"));
+    beammp_info(("Vehicle data network online on port ") + std::to_string(Application::Settings.getAsInt(Settings::Key::General_Port)) + (" with a Max of ")
+        + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) + (" Clients"));
    while (!Application::IsShuttingDown()) {
        try {
-            ip::udp::endpoint client {};
-            std::vector<uint8_t> Data = UDPRcvFromClient(client); // Receives any data from Socket
+            ip::udp::endpoint remote_client_ep {};
+            std::vector<uint8_t> Data = UDPRcvFromClient(remote_client_ep);
            auto Pos = std::find(Data.begin(), Data.end(), ':');
            if (Data.empty() || Pos > Data.begin() + 2)
                continue;
@@ -116,16 +127,31 @@ void TNetwork::UDPServerMain() {
                }

                if (Client->GetID() == ID) {
-                    Client->SetUDPAddr(client);
-                    Client->SetIsConnected(true);
-                    Data.erase(Data.begin(), Data.begin() + 2);
-                    mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
+                    // not initialized yet
+                    if (Client->GetUDPAddr() == ip::udp::endpoint {} || !Client->IsUDPConnected()) {
+                        // same IP (just a sanity check)
+                        if (remote_client_ep.address() == Client->GetTCPSock().remote_endpoint().address()) {
+                            Client->SetUDPAddr(remote_client_ep);
+                            Client->SetIsUDPConnected(true);
+                            beammp_debugf("UDP connected for client {}", ID);
+                        } else {
+                            beammp_debugf("Denied initial UDP packet due to IP mismatch");
+                            return false;
+                        }
+                    }
+                    if (Client->GetUDPAddr() == remote_client_ep) {
+                        Data.erase(Data.begin(), Data.begin() + 2);
+                        mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
+                    } else {
+                        beammp_debugf("Ignored UDP packet due to remote address mismatch");
+                        return false;
+                    }
                }

                return true;
            });
        } catch (const std::exception& e) {
-            beammp_error(("fatal: ") + std::string(e.what()));
+            beammp_warnf("Failed to receive/parse packet via UDP: {}", e.what());
        }
    }
 }
@@ -133,7 +159,10 @@ void TNetwork::UDPServerMain() {
 void TNetwork::TCPServerMain() {
    RegisterThread("TCPServer");

-    ip::tcp::endpoint ListenEp(ip::address::from_string("0.0.0.0"), Application::Settings.Port);
+    // listen on all ipv6 addresses
+    auto port = uint16_t(Application::Settings.getAsInt(Settings::Key::General_Port));
+    ip::tcp::endpoint ListenEp(ip::address::from_string("::"), port);
+    beammp_infof("Listening on 0.0.0.0:{0} and [::]:{0}", port);
    ip::tcp::socket Listener(mServer.IoCtx());
    boost::system::error_code ec;
    Listener.open(ListenEp.protocol(), ec);
@@ -141,6 +170,16 @@ void TNetwork::TCPServerMain() {
        beammp_errorf("Failed to open socket: {}", ec.message());
        return;
    }
+    // set IP_V6ONLY to false to allow both v4 and v6
+    boost::asio::ip::v6_only option(false);
+    Listener.set_option(option, ec);
+    if (ec) {
+        beammp_warnf("Failed to unset IP_V6ONLY on TCP, only IPv6 will work: {}", ec.message());
+    }
+#if defined(BEAMMP_FREEBSD)
+    beammp_warnf("WARNING: On FreeBSD, for IPv4 to work, you must run `sysctl net.inet6.ip6.v6only=0`!");
+    beammp_debugf("This is due to an annoying detail in the *BSDs: In the name of security, unsetting the IPV6_V6ONLY option does not work by default (but does not fail???), as it allows IPv4 mapped IPv6 like ::ffff:127.0.0.1, which they deem a security issue. For more information, see RFC 2553, section 3.7.");
+#endif
    socket_base::linger LingerOpt {};
    LingerOpt.enabled(false);
    Listener.set_option(LingerOpt, ec);
@@ -169,13 +208,13 @@ void TNetwork::TCPServerMain() {
            ip::tcp::endpoint ClientEp;
            ip::tcp::socket ClientSocket = Acceptor.accept(ClientEp, ec);
            if (ec) {
-                beammp_errorf("failed to accept: {}", ec.message());
+                beammp_errorf("Failed to accept() new client: {}", ec.message());
            }
            TConnection Conn { std::move(ClientSocket), ClientEp };
            std::thread ID(&TNetwork::Identify, this, std::move(Conn));
            ID.detach(); // TODO: Add to a queue and attempt to join periodically
        } catch (const std::exception& e) {
-            beammp_error("fatal: " + std::string(e.what()));
+            beammp_errorf("Exception in accept routine: {}", e.what());
        }
    } while (!Application::IsShuttingDown());
 }
@@ -201,7 +240,8 @@ void TNetwork::Identify(TConnection&& RawConnection) {
        if (Code == 'C') {
            Client = Authentication(std::move(RawConnection));
        } else if (Code == 'D') {
-            HandleDownload(std::move(RawConnection));
+            beammp_errorf("Old download packet detected - the client is wildly out of date, this will be ignored");
+            return;
        } else if (Code == 'P') {
            boost::system::error_code ec;
            write(RawConnection.Socket, buffer("P"), ec);
@@ -209,8 +249,8 @@ void TNetwork::Identify(TConnection&& RawConnection) {
        } else {
            beammp_errorf("Invalid code got in Identify: '{}'", Code);
        }
-    } catch(const std::exception& e) {
-        beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket", Code);
+    } catch (const std::exception& e) {
+        beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket: {}", Code, e.what());
        boost::system::error_code ec;
        RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
        if (ec) {
@@ -223,27 +263,7 @@ void TNetwork::Identify(TConnection&& RawConnection) {
    }
 }

-void TNetwork::HandleDownload(TConnection&& Conn) {
-    char D;
-    boost::system::error_code ec;
-    read(Conn.Socket, buffer(&D, 1), ec);
-    if (ec) {
-        Conn.Socket.shutdown(socket_base::shutdown_both, ec);
-        // ignore ec
-        return;
-    }
-    auto ID = uint8_t(D);
-    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
-        ReadLock Lock(mServer.GetClientMutex());
-        if (!ClientPtr.expired()) {
-            auto c = ClientPtr.lock();
-            if (c->GetID() == ID) {
-                c->SetDownSock(std::move(Conn.Socket));
-            }
-        }
-        return true;
-    });
-}
+

 std::string HashPassword(const std::string& str) {
    std::stringstream ret;
@@ -256,8 +276,14 @@ std::string HashPassword(const std::string& str) {

 std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
    auto Client = CreateClient(std::move(RawConnection.Socket));
-    Client->SetIdentifier("ip", RawConnection.SockAddr.address().to_string());
-    beammp_tracef("This thread is ip {}", RawConnection.SockAddr.address().to_string());
+    std::string ip = "";
+    if (RawConnection.SockAddr.address().to_v6().is_v4_mapped()) {
+        ip = boost::asio::ip::make_address_v4(ip::v4_mapped_t::v4_mapped, RawConnection.SockAddr.address().to_v6()).to_string();
+    } else {
+        ip = RawConnection.SockAddr.address().to_string();
+    }
+    Client->SetIdentifier("ip", ip);
+    beammp_tracef("This thread is ip {} ({})", ip, RawConnection.SockAddr.address().to_v6().is_v4_mapped() ? "IPv4 mapped IPv6" : "IPv6");

    beammp_info("Identifying new ClientConnection...");

@@ -278,7 +304,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        return nullptr;
    }

-    if (!TCPSend(*Client, StringToVector("A"))) { //changed to A for Accepted version
+    if (!TCPSend(*Client, StringToVector("A"))) { // changed to A for Accepted version
        // TODO: handle
    }

@@ -289,16 +315,21 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        return nullptr;
    }

-    std::string key(reinterpret_cast<const char*>(Data.data()), Data.size());
+    std::string Key(reinterpret_cast<const char*>(Data.data()), Data.size());
+    std::string AuthKey = Application::Settings.getAsString(Settings::Key::General_AuthKey);
+    std::string ClientIp = Client->GetIdentifiers().at("ip");

-    nlohmann::json AuthReq{};
-    std::string AuthResStr{};
+    nlohmann::json AuthReq {};
+    std::string AuthResStr {};
    try {
        AuthReq = nlohmann::json {
-            { "key", key }
+            { "key", Key },
+            { "auth_key", AuthKey },
+            { "client_ip", ClientIp }
        };

        auto Target = "/pkToUser";
+
        unsigned int ResponseCode = 0;
        AuthResStr = Http::POST(Application::GetBackendUrlForAuth(), 443, Target, AuthReq.dump(), "application/json", &ResponseCode);

@@ -334,22 +365,6 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        return nullptr;
    }

-    if(!Application::Settings.Password.empty()) { // ask password
-        if(!TCPSend(*Client, StringToVector("S"))) {
-            // TODO: handle
-        }
-        beammp_info("Waiting for password");
-        Data = TCPRcv(*Client);
-        std::string Pass = std::string(reinterpret_cast<const char*>(Data.data()), Data.size());
-        if(Pass != HashPassword(Application::Settings.Password)) {
-            beammp_debug(Client->GetName() + " attempted to connect with a wrong password");
-            ClientKick(*Client, "Wrong password!");
-            return {};
-        } else {
-            beammp_debug(Client->GetName() + " used the correct password");
-        }
-    }
-
    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
        std::shared_ptr<TClient> Cl;
@@ -370,10 +385,21 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {

    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers());
    TLuaEngine::WaitForAll(Futures);
-    bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
-        [](const std::shared_ptr<TLuaResult>& Result) {
-            return !Result->Error && Result->Result.is<int>() && bool(Result->Result.as<int>());
-        });
+    bool NotAllowed = false;
+    bool BypassLimit = false;
+
+    for (const auto& Result : Futures) {
+        if (!Result->Error && Result->Result.is<int>()) {
+            auto Res = Result->Result.as<int>();
+
+            if (Res == 1) {
+                NotAllowed = true;
+                break;
+            } else if (Res == 2) {
+                BypassLimit = true;
+            }
+        }
+    }
    std::string Reason;
    bool NotAllowedWithReason = std::any_of(Futures.begin(), Futures.end(),
        [&Reason](const std::shared_ptr<TLuaResult>& Result) -> bool {
@@ -384,15 +410,29 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
            return false;
        });

-    if (NotAllowed) {
-        ClientKick(*Client, "you are not allowed on the server!");
-        return {};
-    } else if (NotAllowedWithReason) {
-        ClientKick(*Client, Reason);
-        return {};
+    if (!NotAllowedWithReason && !Application::Settings.getAsBool(Settings::Key::General_AllowGuests) && Client->IsGuest()) { //! NotAllowedWithReason because this message has the lowest priority
+        NotAllowedWithReason = true;
+        Reason = "No guests are allowed on this server! To join, sign up at: forum.beammp.com.";
    }

-    if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
+    bool Allowed = true;
+    if (NotAllowed) {
+        Allowed = false;
+    }
+    if (NotAllowedWithReason) {
+        Allowed = false;
+    }
+
+    if (NotAllowed) {
+        ClientKick(*Client, "you are not allowed on the server!");
+    } else if (NotAllowedWithReason) {
+        ClientKick(*Client, Reason);
+    }
+
+
+    if (!Allowed) {
+        return {};
+    } else if (mServer.ClientCount() < size_t(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) || BypassLimit) {
        beammp_info("Identification success");
        mServer.InsertClient(Client);
        TCPClient(Client);
@@ -400,6 +440,10 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
        ClientKick(*Client, "Server full!");
    }

+    auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postPlayerAuth", "", Allowed, Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers());
+    // the post event is not cancellable so we dont wait for it
+    LuaAPI::MP::Engine->ReportErrors(PostFutures);
+
    return Client;
 }

@@ -494,7 +538,17 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
    constexpr std::string_view ABG = "ABG:";
    if (Data.size() >= ABG.size() && std::equal(Data.begin(), Data.begin() + ABG.size(), ABG.begin(), ABG.end())) {
        Data.erase(Data.begin(), Data.begin() + ABG.size());
-        return DeComp(Data);
+        try {
+            return DeComp(Data);
+        } catch (const InvalidDataError& ) {
+            beammp_errorf("Failed to decompress packet from a client. The receive failed and the client may be disconnected as a result");
+            // return empty -> error
+            return std::vector<uint8_t>();
+        } catch (const std::runtime_error& e) {
+            beammp_errorf("Failed to decompress packet from a client: {}. The server may be out of RAM! The receive failed and the client may be disconnected as a result", e.what());
+            // return empty -> error
+            return std::vector<uint8_t>();
+        }
    } else {
        return Data;
    }
@@ -585,7 +639,7 @@ void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
 }

 void TNetwork::UpdatePlayer(TClient& Client) {
-    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.MaxPlayers) + ":";
+    std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.getAsInt(Settings::Key::General_MaxPlayers)) + ":";
    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
        ReadLock Lock(mServer.GetClientMutex());
        if (!ClientPtr.expired()) {
@@ -617,6 +671,7 @@ void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr) {
        VehicleData = *LockedData.VehicleData;
    } // End Vehicle Data Lock Scope
    for (auto& v : VehicleData) {
+        LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), v.ID()));
        Packet = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(v.ID());
        SendToAll(&c, StringToVector(Packet), false, true);
    }
@@ -660,7 +715,7 @@ void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
    SyncResources(*LockedClient);
    if (LockedClient->IsDisconnected())
        return;
-    (void)Respond(*LockedClient, StringToVector("M" + Application::Settings.MapName), true); // Send the Map on connect
+    (void)Respond(*LockedClient, StringToVector("M" + Application::Settings.getAsString(Settings::Key::General_Map)), true); // Send the Map on connect
    beammp_info(LockedClient->GetName() + " : Connected");
    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
 }
@@ -695,11 +750,11 @@ void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
    case 'S':
        if (SubCode == 'R') {
            beammp_debug("Sending Mod Info");
-            std::string ToSend = mResourceManager.FileList() + mResourceManager.FileSizes();
-            if (ToSend.empty())
-                ToSend = "-";
+            std::string ToSend = mResourceManager.NewFileList();
+            beammp_debugf("Mod Info: {}", ToSend);
            if (!TCPSend(c, StringToVector(ToSend))) {
-                // TODO: error
+                ClientKick(c, "TCP Send 'SY' failed");
+                return;
            }
        }
        return;
@@ -709,8 +764,6 @@ void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
 }

 void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
-    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
-
    if (!fs::path(UnsafeName).has_filename()) {
        if (!TCPSend(c, StringToVector("CO"))) {
            // TODO: handle
@@ -719,7 +772,7 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
        return;
    }
    auto FileName = fs::path(UnsafeName).filename().string();
-    FileName = Application::Settings.Resource + "/Client/" + FileName;
+    FileName = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client/" + FileName;

    if (!std::filesystem::exists(FileName)) {
        if (!TCPSend(c, StringToVector("CO"))) {
@@ -733,89 +786,44 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
        // TODO: handle
    }

-    /// Wait for connections
-    int T = 0;
-    while (!c.GetDownSock().is_open() && T < 50) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-        T++;
-    }
+    size_t Size = size_t(std::filesystem::file_size(FileName));

-    if (!c.GetDownSock().is_open()) {
-        beammp_error("Client doesn't have a download socket!");
-        if (!c.IsDisconnected())
-            c.Disconnect("Missing download socket");
+    SendFileToClient(c, Size, FileName);
+}
+
+#if defined(BEAMMP_LINUX)
+#include <cerrno>
+#include <cstring>
+#include <sys/sendfile.h>
+#include <unistd.h>
+#include <signal.h>
+#endif
+void TNetwork::SendFileToClient(TClient& c, size_t Size, const std::string& Name) {
+    TScopedTimer timer(fmt::format("Download of '{}' for client {}", Name, c.GetID()));
+#if defined(BEAMMP_LINUX)
+    signal(SIGPIPE, SIG_IGN);
+    // on linux, we can use sendfile(2)!
+    int fd = ::open(Name.c_str(), O_RDONLY);
+    if (fd < 0) {
+        beammp_errorf("Failed to open mod '{}' for sending, error: {}", Name, std::strerror(errno));
        return;
    }
+    // native handle, needed in order to make native syscalls with it
+    int socket = c.GetTCPSock().native_handle();

-    size_t Size = size_t(std::filesystem::file_size(FileName)), MSize = Size / 2;
-
-    std::thread SplitThreads[2] {
-        std::thread([&] {
-            RegisterThread("SplitLoad_0");
-            SplitLoad(c, 0, MSize, false, FileName);
-        }),
-        std::thread([&] {
-            RegisterThread("SplitLoad_1");
-            SplitLoad(c, MSize, Size, true, FileName);
-        })
-    };
-
-    for (auto& SplitThread : SplitThreads) {
-        if (SplitThread.joinable()) {
-            SplitThread.join();
+    ssize_t ret = 0;
+    auto ToSendTotal = Size;
+    auto Start = 0;
+    while (ret < ssize_t(ToSendTotal)) {
+        auto SysOffset = off_t(Start + size_t(ret));
+        ret = sendfile(socket, fd, &SysOffset, ToSendTotal - size_t(ret));
+        if (ret < 0) {
+            beammp_errorf("Failed to send mod '{}' to client {}: {}", Name, c.GetID(), std::strerror(errno));
+            return;
        }
    }
-}

-static std::pair<size_t /* count */, size_t /* last chunk */> SplitIntoChunks(size_t FullSize, size_t ChunkSize) {
-    if (FullSize < ChunkSize) {
-        return { 0, FullSize };
-    }
-    size_t Count = FullSize / (FullSize / ChunkSize);
-    size_t LastChunkSize = FullSize - (Count * ChunkSize);
-    return { Count, LastChunkSize };
-}
-
-TEST_CASE("SplitIntoChunks") {
-    size_t FullSize;
-    size_t ChunkSize;
-    SUBCASE("Normal case") {
-        FullSize = 1234567;
-        ChunkSize = 1234;
-    }
-    SUBCASE("Zero original size") {
-        FullSize = 0;
-        ChunkSize = 100;
-    }
-    SUBCASE("Equal full size and chunk size") {
-        FullSize = 125;
-        ChunkSize = 125;
-    }
-    SUBCASE("Even split") {
-        FullSize = 10000;
-        ChunkSize = 100;
-    }
-    SUBCASE("Odd split") {
-        FullSize = 13;
-        ChunkSize = 2;
-    }
-    SUBCASE("Large sizes") {
-        FullSize = 10 * GB;
-        ChunkSize = 125 * MB;
-    }
-    auto [Count, LastSize] = SplitIntoChunks(FullSize, ChunkSize);
-    CHECK((Count * ChunkSize) + LastSize == FullSize);
-}
-
-const uint8_t* /* end ptr */ TNetwork::SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size) {
-    if (TCPSendRaw(c, Socket, DataPtr, Size)) {
-        return DataPtr + Size;
-    } else {
-        return nullptr;
-    }
-}
-
-void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name) {
+#else
    std::ifstream f(Name.c_str(), std::ios::binary);
    uint32_t Split = 125 * MB;
    std::vector<uint8_t> Data;
@@ -823,11 +831,8 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
        Data.resize(Split);
    else
        Data.resize(Size);
-    ip::tcp::socket* TCPSock { nullptr };
-    if (D)
-        TCPSock = &c.GetDownSock();
-    else
-        TCPSock = &c.GetTCPSock();
+    ip::tcp::socket* TCPSock = &c.GetTCPSock();
+    std::streamsize Sent = 0;
    while (!c.IsDisconnected() && Sent < Size) {
        size_t Diff = Size - Sent;
        if (Diff > Split) {
@@ -850,6 +855,7 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
            Sent += Diff;
        }
    }
+#endif
 }

 bool TNetwork::TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size) {
@@ -872,7 +878,7 @@ bool TNetwork::SendLarge(TClient& c, std::vector<uint8_t> Data, bool isSync) {

 bool TNetwork::Respond(TClient& c, const std::vector<uint8_t>& MSG, bool Rel, bool isSync) {
    char C = MSG.at(0);
-    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+    if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || compressBound(MSG.size()) > 1024) {
        if (C == 'O' || C == 'T' || MSG.size() > 1000) {
            return SendLarge(c, MSG, isSync);
        } else {
@@ -955,7 +961,7 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
        }
        if (Self || Client.get() != c) {
            if (Client->IsSynced() || Client->IsSyncing()) {
-                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
+                if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E' || compressBound(Data.size()) > 1024) {
                    if (C == 'O' || C == 'T' || Data.size() > 1000) {
                        if (Data.size() > 400) {
                            auto CompressedData = Data;
@@ -983,7 +989,7 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
 }

 bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
-    if (!Client.IsConnected() || Client.IsDisconnected()) {
+    if (!Client.IsUDPConnected() || Client.IsDisconnected()) {
        // this can happen if we try to send a packet to a client that is either
        // 1. not yet fully connected, or
        // 2. disconnected and not yet fully removed
--- a/src/TPPSMonitor.cpp
+++ b/src/TPPSMonitor.cpp
@@ -65,18 +65,18 @@ void TPPSMonitor::operator()() {
                V += c->GetCarCount();
            }
            // kick on "no ping"
-            if (c->SecondsSinceLastPing() > (20 * 60) ){
+            if (c->SecondsSinceLastPing() > (20 * 60)) {
                beammp_debugf("client {} ({}) timing out: {}", c->GetID(), c->GetName(), c->SecondsSinceLastPing());
                TimedOutClients.push_back(c);
            } else if (c->IsSynced() && c->SecondsSinceLastPing() > (1 * 60)) {
                beammp_debugf("client {} ({}) timing out: {}", c->GetName(), c->GetID(), c->SecondsSinceLastPing());
                TimedOutClients.push_back(c);
-            } 
+            }

            return true;
        });
        for (auto& ClientToKick : TimedOutClients) {
-            Network().ClientKick(*ClientToKick, "Timeout (no ping for way too long)");
+            ClientToKick->Disconnect("Timeout");
        }
        TimedOutClients.clear();
        if (C == 0 || mInternalPPS == 0) {
--- a/src/TResourceManager.cpp
+++ b/src/TResourceManager.cpp
@@ -17,15 +17,20 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.

 #include "TResourceManager.h"
+#include "Common.h"

 #include <algorithm>
 #include <filesystem>
+#include <fmt/core.h>
+#include <ios>
+#include <nlohmann/json.hpp>
+#include <openssl/evp.h>

 namespace fs = std::filesystem;

 TResourceManager::TResourceManager() {
    Application::SetSubsystemStatus("ResourceManager", Application::Status::Starting);
-    std::string Path = Application::Settings.Resource + "/Client";
+    std::string Path = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client";
    if (!fs::exists(Path))
        fs::create_directories(Path);
    for (const auto& entry : fs::directory_iterator(Path)) {
@@ -52,3 +57,83 @@ TResourceManager::TResourceManager() {

    Application::SetSubsystemStatus("ResourceManager", Application::Status::Good);
 }
+
+std::string TResourceManager::NewFileList() const {
+    return mMods.dump();
+}
+void TResourceManager::RefreshFiles() {
+    mMods.clear();
+    std::unique_lock Lock(mModsMutex);
+
+    std::string Path = Application::Settings.getAsString(Settings::Key::General_ResourceFolder) + "/Client";
+    for (const auto& entry : fs::directory_iterator(Path)) {
+        std::string File(entry.path().string());
+
+        if (entry.path().extension() != ".zip" || std::filesystem::is_directory(entry.path())) {
+            beammp_warnf("'{}' is not a ZIP file and will be ignored", File);
+            continue;
+        }
+
+        try {
+            EVP_MD_CTX* mdctx;
+            const EVP_MD* md;
+            uint8_t sha256_value[EVP_MAX_MD_SIZE];
+            md = EVP_sha256();
+            if (md == nullptr) {
+                throw std::runtime_error("EVP_sha256() failed");
+            }
+
+            mdctx = EVP_MD_CTX_new();
+            if (mdctx == nullptr) {
+                throw std::runtime_error("EVP_MD_CTX_new() failed");
+            }
+            if (!EVP_DigestInit_ex2(mdctx, md, NULL)) {
+                EVP_MD_CTX_free(mdctx);
+                throw std::runtime_error("EVP_DigestInit_ex2() failed");
+            }
+
+            std::ifstream stream(File, std::ios::binary);
+
+            const size_t FileSize = std::filesystem::file_size(File);
+            size_t Read = 0;
+            std::vector<char> Data;
+            while (Read < FileSize) {
+                Data.resize(size_t(std::min<size_t>(FileSize - Read, 4096)));
+                size_t RealDataSize = Data.size();
+                stream.read(Data.data(), std::streamsize(Data.size()));
+                if (stream.eof() || stream.fail()) {
+                    RealDataSize = size_t(stream.gcount());
+                }
+                Data.resize(RealDataSize);
+                if (RealDataSize == 0) {
+                    break;
+                }
+                if (RealDataSize > 0 && !EVP_DigestUpdate(mdctx, Data.data(), Data.size())) {
+                    EVP_MD_CTX_free(mdctx);
+                    throw std::runtime_error("EVP_DigestUpdate() failed");
+                }
+                Read += RealDataSize;
+            }
+            unsigned int sha256_len = 0;
+            if (!EVP_DigestFinal_ex(mdctx, sha256_value, &sha256_len)) {
+                EVP_MD_CTX_free(mdctx);
+                throw std::runtime_error("EVP_DigestFinal_ex() failed");
+            }
+            EVP_MD_CTX_free(mdctx);
+
+            std::string result;
+            for (size_t i = 0; i < sha256_len; i++) {
+                result += fmt::format("{:02x}", sha256_value[i]);
+            }
+            beammp_debugf("sha256('{}'): {}", File, result);
+            mMods.push_back(nlohmann::json {
+                { "file_name", std::filesystem::path(File).filename() },
+                { "file_size", std::filesystem::file_size(File) },
+                { "hash_algorithm", "sha256" },
+                { "hash", result },
+            });
+        } catch (const std::exception& e) {
+            beammp_errorf("Sha256 hashing of '{}' failed: {}", File, e.what());
+        }
+    }
+}
--- a/src/TServer.cpp
+++ b/src/TServer.cpp
@@ -20,6 +20,7 @@
 #include "Client.h"
 #include "Common.h"
 #include "CustomAssert.h"
+#include "TLuaEngine.h"
 #include "TNetwork.h"
 #include "TPPSMonitor.h"
 #include <TLuaPlugin.h>
@@ -123,17 +124,6 @@ TEST_CASE("GetPidVid") {
 TServer::TServer(const std::vector<std::string_view>& Arguments) {
    beammp_info("BeamMP Server v" + Application::ServerVersionString());
    Application::SetSubsystemStatus("Server", Application::Status::Starting);
-    if (Arguments.size() > 1) {
-        Application::Settings.CustomIP = Arguments[0];
-        size_t n = std::count(Application::Settings.CustomIP.begin(), Application::Settings.CustomIP.end(), '.');
-        auto p = Application::Settings.CustomIP.find_first_not_of(".0123456789");
-        if (p != std::string::npos || n != 3 || Application::Settings.CustomIP.substr(0, 3) == "127") {
-            Application::Settings.CustomIP.clear();
-            beammp_warn("IP Specified is invalid! Ignoring");
-        } else {
-            beammp_info("server started with custom IP");
-        }
-    }
    Application::SetSubsystemStatus("Server", Application::Status::Good);
 }

@@ -148,7 +138,6 @@ void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
    beammp_assert(LockedClientPtr != nullptr);
    TClient& Client = *LockedClientPtr;
    beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
-    // TODO: Send delete packets for all cars
    Client.ClearCars();
    WriteLock Lock(mClientsMutex);
    mClients.erase(WeakClientPtr.lock());
@@ -176,7 +165,19 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
    constexpr std::string_view ABG = "ABG:";
    if (Packet.size() >= ABG.size() && std::equal(Packet.begin(), Packet.begin() + ABG.size(), ABG.begin(), ABG.end())) {
        Packet.erase(Packet.begin(), Packet.begin() + ABG.size());
-        Packet = DeComp(Packet);
+        try {
+            Packet = DeComp(Packet);
+        } catch (const InvalidDataError& ) {
+            auto LockedClient = Client.lock();
+            beammp_errorf("Failed to decompress packet from client {}. The client sent invalid data and will now be disconnected.", LockedClient->GetID());
+            Network.ClientKick(*LockedClient, "Sent invalid compressed packet (this is likely a bug on your end)");
+            return;
+        } catch (const std::runtime_error& e) {
+            auto LockedClient = Client.lock();
+            beammp_errorf("Failed to decompress packet from client {}: {}. The server might be out of RAM! The client will now be disconnected.", LockedClient->GetID(), e.what());
+            Network.ClientKick(*LockedClient, "Decompression failed (likely a server-side problem)");
+            return;
+        }
    }
    if (Packet.empty()) {
        return;
@@ -234,16 +235,18 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
        TLuaEngine::WaitForAll(Futures);
        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
-        if (std::any_of(Futures.begin(), Futures.end(),
-                [](const std::shared_ptr<TLuaResult>& Elem) {
-                    return !Elem->Error
-                        && Elem->Result.is<int>()
-                        && bool(Elem->Result.as<int>());
-                })) {
-            break;
+        bool Rejected = std::any_of(Futures.begin(), Futures.end(),
+            [](const std::shared_ptr<TLuaResult>& Elem) {
+                return !Elem->Error
+                    && Elem->Result.is<int>()
+                    && bool(Elem->Result.as<int>());
+            });
+        if (!Rejected) {
+            std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
+            Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
        }
-        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
-        Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
+        auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postChatMessage", "", !Rejected, LockedClient->GetID(), LockedClient->GetName(), Message);
+        LuaAPI::MP::Engine->ReportErrors(PostFutures);
        return;
    }
    case 'E':
@@ -297,7 +300,7 @@ bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
        c.SetUnicycleID(ID);
        return true;
    } else {
-        return c.GetCarCount() < Application::Settings.MaxCars;
+        return c.GetCarCount() < Application::Settings.getAsInt(Settings::Key::General_MaxCars);
    }
 }

@@ -325,19 +328,26 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
                    return !Result->Error && Result->Result.is<int>() && Result->Result.as<int>() != 0;
                });

+            bool SpawnConfirmed = false;
            if (ShouldSpawn(c, CarJson, CarID) && !ShouldntSpawn) {
                c.AddNewCar(CarID, Packet);
                Network.SendToAll(nullptr, StringToVector(Packet), true, true);
+                SpawnConfirmed = true;
            } else {
                if (!Network.Respond(c, StringToVector(Packet), true)) {
                    // TODO: handle
                }
                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
+                LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), CarID));
                if (!Network.Respond(c, StringToVector(Destroy), true)) {
                    // TODO: handle
                }
                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
+                SpawnConfirmed = false;
            }
+            auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postVehicleSpawn", "", SpawnConfirmed, c.GetID(), CarID, Packet.substr(3));
+            // the post event is not cancellable so we dont wait for it
+            LuaAPI::MP::Engine->ReportErrors(PostFutures);
        }
        return;
    case 'c': {
@@ -356,18 +366,26 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ

            auto FoundPos = Packet.find('{');
            FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
+            bool Allowed = false;
            if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
                && !ShouldntAllow) {
                Network.SendToAll(&c, StringToVector(Packet), false, true);
                Apply(c, VID, Packet);
+                Allowed = true;
            } else {
                if (c.GetUnicycleID() == VID) {
                    c.SetUnicycleID(-1);
                }
                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID);
                Network.SendToAll(nullptr, StringToVector(Destroy), true, true);
+                LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
                c.DeleteCar(VID);
+                Allowed = false;
            }
+
+            auto PostFutures = LuaAPI::MP::Engine->TriggerEvent("postVehicleEdited", "", Allowed, c.GetID(), VID, Packet.substr(3));
+            // the post event is not cancellable so we dont wait for it
+            LuaAPI::MP::Engine->ReportErrors(PostFutures);
        }
        return;
    }
@@ -403,13 +421,21 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
        }
        return;
    }
-    case 't':
+    case 't': {
        beammp_trace(std::string(("got 'Ot' packet: '")) + Packet + ("' (") + std::to_string(Packet.size()) + (")"));
+        auto MaybePidVid = GetPidVid(Data.substr(0, Data.find(':', 1)));
+        if (MaybePidVid) {
+            std::tie(PID, VID) = MaybePidVid.value();
+        }
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
+            Network.SendToAll(&c, StringToVector(Packet), false, true);
+        }
+        return;
+    }
+    case 'm': {
        Network.SendToAll(&c, StringToVector(Packet), false, true);
        return;
-    case 'm':
-        Network.SendToAll(&c, StringToVector(Packet), true, true);
-        return;
+    }
    default:
        beammp_trace(std::string(("possibly not implemented: '") + Packet + ("' (") + std::to_string(Packet.size()) + (")")));
        return;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,6 +20,7 @@
 #include "Common.h"
 #include "Http.h"
 #include "LuaAPI.h"
+#include "Settings.h"
 #include "SignalHandling.h"
 #include "TConfig.h"
 #include "THeartbeatThread.h"
@@ -35,19 +36,19 @@
 #include <thread>

 static const std::string sCommandlineArguments = R"(
-USAGE: 
+USAGE:
    BeamMP-Server [arguments]
-    
+
 ARGUMENTS:
-    --help              
+    --help
                        Displays this help and exits.
    --port=1234
                        Sets the server's listening TCP and
                        UDP port. Overrides ENV and ServerConfig.
    --config=/path/to/ServerConfig.toml
-                        Absolute or relative path to the 
+                        Absolute or relative path to the
                        Server Config file, including the
-                        filename. For paths and filenames with 
+                        filename. For paths and filenames with
                        spaces, put quotes around the path.
    --working-directory=/path/to/folder
                        Sets the working directory of the Server.
@@ -58,7 +59,7 @@ ARGUMENTS:

 EXAMPLES:
    BeamMP-Server --config=../MyWestCoastServerConfig.toml
-        Runs the BeamMP-Server and uses the server config file 
+        Runs the BeamMP-Server and uses the server config file
        which is one directory above it and is named
        'MyWestCoastServerConfig.toml'.
 )";
@@ -150,7 +151,7 @@ int BeamMPServerMain(MainArguments Arguments) {
                beammp_errorf("Custom port requested via --port is invalid: '{}'", Port.value());
                return 1;
            } else {
-                Application::Settings.Port = P;
+                Application::Settings.set(Settings::Key::General_Port, P);
                beammp_info("Custom port requested via commandline arguments: " + Port.value());
            }
        }
@@ -165,6 +166,9 @@ int BeamMPServerMain(MainArguments Arguments) {

    SetupSignalHandlers();

+    Settings settings {};
+    beammp_infof("Server name set in new impl: {}", settings.getAsString(Settings::Key::General_Name));
+
    bool Shutdown = false;
    Application::RegisterShutdownHandler([&Shutdown] {
        beammp_info("If this takes too long, you can press Ctrl+C repeatedly to force a shutdown.");
@@ -186,6 +190,7 @@ int BeamMPServerMain(MainArguments Arguments) {

    beammp_trace("Running in debug mode on a debug build");
    TResourceManager ResourceManager;
+    ResourceManager.RefreshFiles();
    TPPSMonitor PPSMonitor(Server);
    THeartbeatThread Heartbeat(ResourceManager, Server);
    TNetwork Network(Server, PPSMonitor, ResourceManager);
@@ -193,11 +198,7 @@ int BeamMPServerMain(MainArguments Arguments) {
    PPSMonitor.SetNetwork(Network);
    Application::CheckForUpdates();

-    TPluginMonitor PluginMonitor(fs::path(Application::Settings.Resource) / "Server", LuaEngine);
-
-    if (Application::Settings.HTTPServerEnabled) {
-        Http::Server::THttpServerInstance HttpServerInstance {};
-    }
+    TPluginMonitor PluginMonitor(fs::path(Application::Settings.getAsString(Settings::Key::General_ResourceFolder)) / "Server", LuaEngine);

    Application::SetSubsystemStatus("Main", Application::Status::Good);
    RegisterThread("Main(Waiting)");
--- a/test/Server/JsonTests/main.lua
+++ b/test/Server/JsonTests/main.lua
@@ -0,0 +1,66 @@
+local function assert_eq(x, y, explain)
+	if x ~= y then
+		print("assertion '"..explain.."' failed:\n\tgot:\t", x, "\n\texpected:", y)
+	end
+end
+
+---@param o1 any|table First object to compare
+---@param o2 any|table Second object to compare
+---@param ignore_mt boolean True to ignore metatables (a recursive function to tests tables inside tables)
+function equals(o1, o2, ignore_mt)
+    if o1 == o2 then return true end
+    local o1Type = type(o1)
+    local o2Type = type(o2)
+    if o1Type ~= o2Type then return false end
+    if o1Type ~= 'table' then return false end
+
+    if not ignore_mt then
+        local mt1 = getmetatable(o1)
+        if mt1 and mt1.__eq then
+            --compare using built in method
+            return o1 == o2
+        end
+    end
+
+    local keySet = {}
+
+    for key1, value1 in pairs(o1) do
+        local value2 = o2[key1]
+        if value2 == nil or equals(value1, value2, ignore_mt) == false then
+            return false
+        end
+        keySet[key1] = true
+    end
+
+    for key2, _ in pairs(o2) do
+        if not keySet[key2] then return false end
+    end
+    return true
+end
+
+
+local function assert_table_eq(x, y, explain)
+	if not equals(x, y, true) then
+		print("assertion '"..explain.."' failed:\n\tgot:\t", x, "\n\texpected:", y)
+	end
+end
+
+assert_eq(Util.JsonEncode({1, 2, 3, 4, 5}), "[1,2,3,4,5]", "table to array")
+assert_eq(Util.JsonEncode({"a", 1, 2, 3, 4, 5}), '["a",1,2,3,4,5]', "table to array")
+assert_eq(Util.JsonEncode({"a", 1, 2.0, 3, 4, 5}), '["a",1,2.0,3,4,5]', "table to array")
+assert_eq(Util.JsonEncode({hello="world", john={doe = 1, jane = 2.5, mike = {2, 3, 4}}, dave={}}), '{"dave":{},"hello":"world","john":{"doe":1,"jane":2.5,"mike":[2,3,4]}}', "table to obj")
+assert_eq(Util.JsonEncode({a = nil}), "{}", "null obj member")
+assert_eq(Util.JsonEncode({1, nil, 3}), "[1,3]", "null array member")
+assert_eq(Util.JsonEncode({}), "{}", "empty array/table")
+assert_eq(Util.JsonEncode({1234}), "[1234]", "int")
+assert_eq(Util.JsonEncode({1234.0}), "[1234.0]", "double")
+
+assert_table_eq(Util.JsonDecode("[1,2,3,4,5]"), {1, 2, 3, 4, 5}, "decode table to array")
+assert_table_eq(Util.JsonDecode('["a",1,2,3,4,5]'), {"a", 1, 2, 3, 4, 5}, "decode table to array")
+assert_table_eq(Util.JsonDecode('["a",1,2.0,3,4,5]'), {"a", 1, 2.0, 3, 4, 5}, "decode table to array")
+assert_table_eq(Util.JsonDecode('{"dave":{},"hello":"world","john":{"doe":1,"jane":2.5,"mike":[2,3,4]}}'), {hello="world", john={doe = 1, jane = 2.5, mike = {2, 3, 4}}, dave={}}, "decode table to obj")
+assert_table_eq(Util.JsonDecode("{}"), {a = nil}, "decode null obj member")
+assert_table_eq(Util.JsonDecode("[1,3]"), {1, 3}, "decode null array member")
+assert_table_eq(Util.JsonDecode("{}"), {}, "decode empty array/table")
+assert_table_eq(Util.JsonDecode("[1234]"), {1234}, "decode int")
+assert_table_eq(Util.JsonDecode("[1234.0]"), {1234.0}, "decode double")
--- a/2
+++ b/2
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -13,7 +13,6 @@
    "nlohmann-json",
    "openssl",
    "rapidjson",
-    "sol2",
-    "toml11"
+    "sol2"
  ]
 }
Author	SHA1	Message	Date
Lion	cf3985ce00	Add Lua function to get a player's role (#366 ) Adds `MP.GetPlayerRole(player_id)` to the Lua API to get a player's role ("USER", "EA", "MDEV", "STAFF", "ET") by their player id. Currently you can only get someone's role in onPlayerAuth from the parameters and in onVehicleSpawned and onVehicleEdited from the packet data, but not in onPlayerJoin for example without storing it.	2024-10-05 16:09:37 +02:00
Lion Kortlepel	b04c5068ea	bump version	2024-10-05 16:09:02 +02:00
Lion	077bb6b1cd	Add player limit bypass to onPlayerAuth (#372 ) With this PR, returning 2 in onPlayerAuth will allow the player to join without checking if the server is full. This makes it easier for plugin developers to allow for example their staff to join without having to change the max player count.	2024-10-05 16:07:53 +02:00
Lion	0850cde1fb	Add MP.SendNotification (#373 ) Adds MP.SendNotification(message, icon, category (optional) ) to the Lua api. Uses the newly added "N" packet in the mod.	2024-10-05 16:07:27 +02:00
Lion	611e53b484	Mod hashing + better download (#374 )	2024-10-04 23:29:11 +02:00
Tixx	f039f57f11	Fix error messages on sendnotification	2024-10-04 20:24:30 +02:00
Lion Kortlepel	5d34090952	fix stupid read size error leading to corrupt zip	2024-09-29 01:34:38 +02:00
Lion Kortlepel	88ca17236a	remove two-socket download	2024-09-29 01:15:48 +02:00
Lion Kortlepel	a4b62d013c	implement mod hashing + new download	2024-09-29 00:32:52 +02:00
Tixx	9a0270cb09	Return nil instead of "" when there's no client	2024-09-28 21:05:04 +02:00
Lion	55f1a3c734	Add MP.Get (#369 ) Adds `MP.Get(ConfigID)` to the lua api to get the current server settings. ```lua lua> print(MP.Get(MP.Settings.Name])) [LUA] BeamMP Server lua> MP.Set(MP.Settings.Name, 'Hello World') [INFO] Set `Name` to Hello World lua> print(MP.Get(MP.Settings.Name)) [LUA] Hello World ``` Closes #146	2024-09-28 20:30:14 +02:00
Tixx	bb3c762d68	Add player limit bypass to onPlayerAuth	2024-09-28 14:52:04 +02:00
Tixx	3ade7f5743	Add MP.SendNotification	2024-09-28 13:35:25 +02:00
Tixx	9d44c2063c	Remove break after return	2024-09-22 15:34:13 +02:00
Tixx	17185da53b	Add MP.Get	2024-09-21 23:17:08 +02:00
Tixx	623dfa17d5	Remove expiry check and add braces	2024-09-20 14:45:41 +02:00
Lion	7f69e336a9	Fix exception propagation on packet decompression (#365 )	2024-09-20 11:39:36 +02:00
Lion	f08dfc0585	fix MaxPlayers setting using value of MaxCars (#367 )	2024-09-20 11:39:22 +02:00
Deer McDurr	a9dee2bec5	fix MaxPlayers using value of MaxCars	2024-09-19 22:15:12 +02:00
Lion Kortlepel	5319c2878a	bump version to v3.5.1	2024-09-19 17:24:57 +02:00
Lion Kortlepel	73f494041a	fix exception propagation on packet decompression	2024-09-19 16:59:17 +02:00
Tixx	caafb216c9	Add MP.GetPlayerRole(player_id)	2024-09-19 07:51:07 +02:00
Lion Kortlepel	530d605bc1	fix release	2024-09-19 01:54:16 +02:00
Lion	63b2a8e4a3	Add post event(s) (#364 ) Adds `post` events which are triggered after the respective `on` event has completed and the results have been sent. They have the same arguments as the `on` function, with the exception that another argument is added in the beginning which contains whether the `on` variant was cancelled.	2024-09-19 01:37:17 +02:00
Lion	a7a19d9a30	Fix disconnect not calling onVehicleDeleted (#336 ) OnDisconnect sent a packet to the client, which was already disconnected.	2024-09-18 18:08:46 +02:00
Lion Kortlepel	3068a0e5c4	add back car deletion	2024-09-18 16:46:11 +02:00
Lion Kortlepel	f70514a021	add postVehicleEdited why the fuck is it in past tense	2024-09-18 16:34:56 +02:00
Lion Kortlepel	94768c916d	add postChatMessage	2024-09-18 16:30:49 +02:00
Lion Kortlepel	86b37e8ae1	move postPlayerAuth later again, after client insert	2024-09-18 16:26:26 +02:00
Lion Kortlepel	8f9db10474	move postPlayerAuth to after kick	2024-09-18 16:26:20 +02:00
Lion Kortlepel	afa5a04043	add postPlayerAuth	2024-09-18 16:26:16 +02:00
Lion Kortlepel	4444be0af9	add postVehicleSpawn event	2024-09-18 16:26:11 +02:00
Lion	5f7207bc52	Move toml11 out of vcpkg since the toml11 authors broke it (#352 )	2024-09-18 16:18:38 +02:00
Lion Kortlepel	9927d2befb	add toml11 submodule	2024-09-18 15:58:55 +02:00
Lion Kortlepel	60f88916a9	remove toml11 from vcpkg.json	2024-09-18 15:51:11 +02:00
SaltySnail	0cc73e70c9	fix onVehicleDeleted not being triggered when onVehicleSpawn is triggered	2024-09-15 20:26:20 +02:00
SaltySnail	bfb2086e05	fix all other places where onVehicleDeleted isn't triggered after a delete packet is sent	2024-09-15 20:26:20 +02:00
SaltySnail	9d67838f8f	fix #225	2024-09-15 20:26:20 +02:00
20dka	bbfb85155e	fix github workflows updated upload-artifacts action	2024-09-15 10:25:04 +01:00
Lion	ce5f2e666d	Download Refactoring (#356 ) Limits download RAM usage (to zero) on Linux by use of `sendfile(2)`	2024-08-31 20:32:23 +02:00
Lion	e076197ab2	support for non toplevel event handlers (#360 ) this change replaces the `_G` event handler lookup with a lua snippet that fetches whatever the user has set, which could be a module's function, a builtin global, or even a function defined in the `RegisterEvent `call	2024-08-31 20:30:02 +02:00
20dka	ee03afb9a1	fix gh linux build	2024-08-29 20:17:01 +02:00
20dka	f775678e2e	support for nested lua handlers	2024-08-28 22:46:37 +02:00
20dka	45bb6ca6f3	fill out lua EventName	2024-08-28 22:15:57 +02:00
SaltySnail	f5f6b8534d	Add IPv6 support (#349 ) Adds IPv6 support. FreeBSD users beware: From this point forward, you will have to set `sysctl net.inet6.ip6.v6only=0` so that the BeamMP-Server continues to work. The server also prints this information.	2024-08-20 20:35:48 +02:00
Lion Kortlepel	f3627ce0bf	Merge branch 'fix-little-issues' into minor	2024-07-28 10:54:55 +02:00
Lion Kortlepel	e1aaaf5e63	Merge branch 'fix-little-issues' into minor	2024-07-28 10:52:33 +02:00
Lion Kortlepel	a147edd31a	update to toml11 v3.4.1	2024-07-28 10:50:01 +02:00
Lion	214096409d	Add stack trace to server lua engine (#350 ) Don't worry about it	2024-07-27 19:57:37 +02:00
SaltySnail	4a062e5aa0	Fix not following naming convention Co-authored-by: Lion <development@kortlepel.com>	2024-07-27 19:50:24 +02:00
Lion Kortlepel	ba723ee106	revert fix for sol2	2024-07-16 17:51:31 +02:00
Lion Kortlepel	49ed82bea1	add more info to debug print for freebsd ipv6 support	2024-07-16 17:30:45 +02:00
Lion Kortlepel	0d848fda7c	add warning about IPV6_V6ONLY=false not working on FreeBSD	2024-07-16 17:25:29 +02:00
Lion Kortlepel	a0040d8c57	fix invalid sol2 linking	2024-07-16 16:58:12 +02:00
Lion	baa2c86e25	fix typo in DeComp buffer size logic	2024-07-15 12:35:32 +02:00
Lion	0950d367d4	refactor decompression limits and resizing	2024-07-15 12:31:09 +02:00
Lion	8b21b6cef3	add comments to DeComp() magic numbers	2024-07-15 12:26:08 +02:00
Lion Kortlepel	82a6d4af60	repeat sendfile() until all data is sent	2024-07-14 17:01:24 +02:00
Lion Kortlepel	8b753ab6ea	ignore SIGPIPE in sendfile() implementation of mod sending	2024-07-14 17:01:08 +02:00
Lion Kortlepel	b097acfd4a	use sendfile64	2024-07-14 16:17:39 +02:00
Lion Kortlepel	5baeaa72c2	clarify RAM requirements	2024-07-14 16:03:08 +02:00
Lion Kortlepel	bd76e28ca6	use sendfile to send mods on linux	2024-07-14 15:33:26 +02:00
SaltySnail	012ce08b91	Add proper lua server stacktraces	2024-07-14 03:18:59 +02:00
Lion Kortlepel	9db3619cd8	cleanup and add comments to traceback feature	2024-07-14 01:50:31 +02:00
Lion Kortlepel	6f4c3f0ceb	add traceback to lua errors by way of shitty lua hacks	2024-07-14 01:43:01 +02:00
SaltySnail	4fad047bf4	Add working stacktrace	2024-07-14 01:00:57 +02:00
SaltySnail	5502c74229	add stacktrace to the server lua engine (WIP)	2024-07-14 00:22:48 +02:00
Lion Kortlepel	eaedeb5324	add IPv6 support	2024-07-12 15:45:50 +02:00
Lion	72022e3349	Refactor config, add `settings` command (#295 ) Fix #158	2024-06-26 14:24:24 +02:00
Lucca Jiménez Könings	08374b1398	deprecate Ubuntu 20.04	2024-06-26 14:12:45 +02:00
Lucca Jiménez Könings	29f4d0d286	run clang-format	2024-06-26 14:06:06 +02:00
Lucca Jiménez Könings	3c80bcbf01	remove line ChronoWrapper.cpp:13 as discussed in review	2024-06-26 13:40:39 +02:00
Lucca Jiménez Könings	5919fc6f47	improve acl error message consistency	2024-06-26 13:38:07 +02:00
Lucca Jiménez Könings	461fb5d896	improve error messages	2024-06-26 13:34:32 +02:00
Lucca Jiménez Könings	6731b3e977	fix typo	2024-06-26 13:12:10 +02:00
Lucca Jiménez Könings	e7c7f45039	fix chrono wrapper	2024-06-26 13:10:46 +02:00
Lucca Jiménez Könings	0748267fab	remove superflous comments	2024-06-26 13:10:34 +02:00
Lucca Jiménez Könings	8c32d760be	fix confusing error when setting wrong key	2024-06-26 13:09:18 +02:00
Lucca Jiménez Könings	7919f81927	remove dead code for deprecated config format	2024-06-26 13:08:26 +02:00
Lucca Jiménez Könings	26ef39827e	fix AuthKey being writable from console	2024-06-26 13:07:58 +02:00
Lucca Jiménez Könings	2451e08b01	update remaining sections of code after merge	2024-06-26 12:31:47 +02:00
Lucca Jiménez Könings	25739cb1bd	Merge branch 'minor' into 158-bug-running-settings-help-returns-nothing	2024-06-26 11:43:38 +02:00
Lucca Jiménez Könings	814927d0a1	change log output for consistency	2024-06-26 11:11:13 +02:00
Lucca Jiménez Könings	6c0a8d1d62	remove superflous code	2024-06-26 11:10:27 +02:00
Lucca Jiménez Könings	0d3256c429	Remove todo in accordance with review	2024-06-26 11:08:57 +02:00
Lucca Jiménez Könings	509225f151	Move tests from .h to .cpp	2024-06-26 11:07:46 +02:00
Lucca Jiménez Könings	73ecef1a87	Move map declarations in Settings.h into .cpp	2024-06-26 11:07:14 +02:00
Lion Kortlepel	28a9690a64	validate Ot packets	2024-06-23 21:58:32 +02:00
Lion Kortlepel	07a8d49046	fix tcp send also	2024-06-22 23:56:18 +02:00
Lion Kortlepel	bfb0675efa	send large packets over tcp	2024-06-22 23:51:01 +02:00
Lion Kortlepel	105fd6d4c9	rewrite compression and decompression to limit at 30 MB	2024-06-22 22:47:31 +02:00
Lion	a9385c47e1	Adjust allow guests feature in heartbeat to follow Backend#33 (#341 ) https://github.com/BeamMP/Backend/issues/33	2024-06-20 09:00:13 +02:00
Lion	1e9c4e357c	adjust allow guests feature in heartbeat to follow Backend#33 https://github.com/BeamMP/Backend/issues/33	2024-06-20 08:58:58 +02:00
Lion	a998a7c091	Reuse HTTP connections (#339 ) fix #223	2024-06-16 03:10:29 +02:00
SaltySnail	277036fc52	fix not following naming convention	2024-06-16 03:00:18 +02:00
SaltySnail	e776848a76	Update src/Http.cpp Co-authored-by: Lion <development@kortlepel.com>	2024-06-16 02:53:01 +02:00
SaltySnail	63fa65e9a7	Update src/Http.cpp Co-authored-by: Lion <development@kortlepel.com>	2024-06-16 02:52:55 +02:00
SaltySnail	c07baeed1a	add reusing Http connections	2024-06-16 02:45:53 +02:00
Lion	33b5384398	Add config setting to allow/deny guests (#335 ) fix #247	2024-06-11 09:01:49 +02:00
SaltySnail	e94cfd641d	remove debug print	2024-06-10 23:16:45 +02:00
SaltySnail	6e590ff18a	fix naming of the ENV	2024-06-10 23:16:16 +02:00
SaltySnail	91bc7dea79	Update src/TNetwork.cpp Co-authored-by: Lion <development@kortlepel.com>	2024-06-10 23:12:23 +02:00
Lion	8b94b1f0ef	Add an entry in serverconfig.toml for the time between update reminders (#329 ) fix #321	2024-06-10 22:59:09 +02:00
SaltySnail	5dab48af92	fix #247 , add allow guests config setting.	2024-06-10 22:06:09 +02:00
SaltySnail	f3060f5247	change default from 3h to 30s	2024-06-08 20:24:46 +02:00
SaltySnail	c61816dfeb	fix 0....2h being allowed as time format	2024-06-01 23:42:44 +02:00
Lion	2fcb53530a	Add more info to return to backend's /pkToUser endpoint (#332 ) Features added were tested through a custom client (since @sla-ppy is too cheap to own the game) with @lionkor while pair programming. Fixes: #303	2024-06-01 12:25:01 +02:00
sla-ppy	cee039d922	Merge branch 'BeamMP:minor' into fix_303	2024-05-30 19:15:06 +02:00
sla-ppy	566f0b55f7	remove debug info	2024-05-28 14:53:19 +02:00
sla-ppy	58a7e39419	add more info to return to pkToUser endpoint	2024-05-28 14:15:41 +02:00
SaltySnail	bf7f1ef1a5	change update reminder frequency description to include an example of using a float	2024-05-25 21:59:34 +02:00
SaltySnail	e35bf4fe15	change TimeFromStringWithLiteral to work with floats	2024-05-25 21:43:54 +02:00
SaltySnail	419a951c29	change wrong version number lol Co-authored-by: Lion <development@kortlepel.com>	2024-05-25 20:45:53 +02:00
SaltySnail	135008a73c	Change time_str to be a reference Co-authored-by: Lion <development@kortlepel.com>	2024-05-25 20:44:51 +02:00
SaltySnail	29c3fed374	fix #321	2024-05-25 20:34:33 +02:00
Lion	93192fd9b5	Fix #326 Arch Compile Issue "copy_n is not a member of 'std';" (#327 ) added ```#include <algorithm>``` to Common.h, needed for "copy_n"	2024-05-24 23:01:48 +02:00
redracer	eea041e8eb	Fix #326 Arch Compile Issue "copy_n is not a member of 'std';" added #include <algorithm> to Common.h, needed for "copy_n"	2024-05-24 16:10:37 -04:00
Lion	a3670bff4a	Add platform, lua, openssl version to `version` command, show lua version on startup (#325 ) Closes #300	2024-05-24 12:58:30 +02:00
sla-ppy	1b60e89f26	add lua info on LuaEngine startup	2024-05-24 12:31:01 +02:00
sla-ppy	06e5805428	change version cmd behaviour	2024-05-24 12:12:20 +02:00
Lion Kortlepel	04e8d00daa	fix invalid default initialization in SettingsMap	2024-05-24 09:07:54 +02:00
Lucca Jiménez Könings	d30dccc94a	Separate settings tests Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-21 14:24:44 +02:00
Lucca Jiménez Könings	84f5f95e54	Refactor: feedback from code review Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-21 13:40:33 +02:00
Lucca Jiménez Könings	67db9358e1	Fix concepts related error (for compat with gcc9) Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-21 11:50:46 +02:00
Lion	fd2f713485	bump version	2024-05-21 08:52:05 +02:00
Lion	c880460a55	Fix macos compile Issue (#324 ) Related [Issue 206](https://github.com/BeamMP/BeamMP-Server/issues/206)	2024-05-19 12:57:49 +02:00
Maximilian Rehms	7f54bcfaec	successful implemented suggested change to "lua_nil" Co-authored-by: Lion <development@kortlepel.com>	2024-05-18 22:36:57 +02:00
Maximilian Rehms	785c5343cd	removed warnig suppression	2024-05-18 15:11:42 +02:00
Maximilian Rehms	40e5496819	compiles now on macos	2024-05-18 15:06:26 +02:00
Lucca Jiménez Könings	4c9fbc250a	Change concepts in Settings.set + add test for remaining set overloads Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-17 11:53:51 +02:00
Lion Kortlepel	31ce0cc7de	add unit test + concept constraints for set(string)	2024-05-17 11:08:05 +02:00
Lion Kortlepel	3a8f4ded29	fix errors in Settings::set	2024-05-17 10:50:50 +02:00
Lucca Jiménez Könings	f567645db6	Add issue with implicit argument type conversions for `Settings.set()` Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-15 13:40:25 +02:00
Lucca Jiménez Könings	3609fd77ec	Potential fix for compiler issues on Ubuntu Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-15 13:15:54 +02:00
Lucca Jiménez Könings	a5e3fc8fb9	Add Sync.h Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-15 12:57:08 +02:00
Lucca Jiménez Könings	bcd4b5a235	Fix Debug asserts on FreeBSD Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-15 12:54:50 +02:00
Lucca Jiménez Könings	8c15b87628	Refactor all references to settings to use new `Settings` type Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-15 12:52:09 +02:00
Lucca Jiménez Könings	13e641b3a3	Remove interfering legacy code (http,password,etc) Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-15 12:45:19 +02:00
Lion	5f9726f10f	Use hard disconnect instead of ClientKick in timeout (#320 )	2024-05-11 13:00:25 +02:00
Lion Kortlepel	fcd408970b	always initialize ping timer	2024-05-11 12:44:41 +02:00
Lion	cf5ebcbd1a	Fix lua number (int vs double) handling, add lua unit tests for json encode + decode, fix empty array or table serializing to null (#319 )	2024-05-11 12:19:13 +02:00
Lion	c9d926f9e3	Fix Lua assert error when adding values to tables (e.g. in event arguments) (#318 ) When adding elements to a table, the .add() function does not behave as expected in various cases, making it really shit and difficult to use. Instead, we keep our own index and just add one by one. It works, and it's easy to understand. This may lead to indices which are nil, i.e. non-fully-sequential tables, but I can't be asked to worry about it because that shouldn't be an issue when we use .set() everywhere.	2024-05-11 12:18:56 +02:00
Lion Kortlepel	9f47978f0f	use hard disconnect insteadof clientkick	2024-05-11 12:17:02 +02:00
Lion Kortlepel	a0f649288e	fix lua number handling, add lua unit tests for json encode + decode	2024-05-10 15:54:52 +02:00
Lion Kortlepel	b995a222ff	bump version	2024-05-10 14:57:22 +02:00
Lion Kortlepel	c5dff8b913	fix lua assertion on event argument passing When adding elements to a table, the .add() function does not behave as expected in various cases, making it really shit and difficult to use. Instead, we keep our own index and just add one by one. It works, and it's easy to understand. This may lead to indices which are nil, i.e. non-fully-sequential tables, but I can't be asked to worry about it because that shouldn't be an issue when we use .set() everywhere.	2024-05-10 14:45:06 +02:00
Lucca Jiménez Könings	ff812429ed	Fix `settings set` not accepting boolean literals Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings	639c46ad36	Remove additional debug calls Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings	158875a962	Remove debug code for new Settings implementation Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings	c6dac55679	Wrap Settings into synchronization primitives Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:06 +02:00
Lucca Jiménez Könings	37109ae3f1	Make 'General::Debug' setting r/w from runtime Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	d6b78b9683	Fix argument parsing at wrong index Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	f5e2f7425f	Fix `ComposedKey` metadata not printing to console Make ComposedKey formattable by overloading fmt::format Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	8693b8a2b0	Add `list` argument to command `settings` Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	3989961ff9	Add `get` and `set` to console command `settings` Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	a357ff8ca3	Add missing options to defaults Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	86f0052e07	Add rudimentary access control to type `Settings` Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	89034a64e0	Add logic for new Settings type Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00
Lucca Jiménez Könings	55f5437618	Add new type `Settings` & refactor TSettings behavior into Settings by adding getters/setters Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>	2024-05-07 18:16:05 +02:00