diff --git a/CMakeLists.txt b/CMakeLists.txt index 30c989615..60c77f0b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.19) -project(open-mp LANGUAGES C CXX VERSION 1.0.1) +project(open-mp LANGUAGES C CXX VERSION 1.1.0) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp index 80c6298c4..d253215bd 100644 --- a/Server/Components/LegacyNetwork/legacy_network_impl.cpp +++ b/Server/Components/LegacyNetwork/legacy_network_impl.cpp @@ -9,6 +9,7 @@ #include "legacy_network_impl.hpp" #include "Query/query.hpp" #include "raknet/../../SAMPRakNet.hpp" +#include #include #include #include @@ -790,13 +791,14 @@ void RakNetLegacyNetwork::start() bool allow037 = *config.getBool("network.allow_037_clients"); query.setCore(core); - query.setRuleValue("version", !allow037 ? "0.3.DL-R1" : "0.3.7-R2"); - query.setRuleValue("artwork", artwork ? "Yes" : "No"); - if (allow037) - { - query.setRuleValue("allow_DL", "Yes"); - } + std::stringstream version; + version << "omp " << OMP_VERSION_MAJOR << "." << OMP_VERSION_MINOR << "." << OMP_VERSION_PATCH << "." << BUILD_NUMBER; + query.setRuleValue("version", version.str()); + // Send as a rule to announce which clients are allowed to join + query.setRuleValue("allowed_clients", !allow037 ? "0.3.DL" : "0.3.7, 0.3.DL"); + + query.setRuleValue("artwork", artwork ? "Yes" : "No"); query.setMaxPlayers(maxPlayers); query.buildPlayerDependentBuffers(); diff --git a/Server/Components/Pickups/pickup.hpp b/Server/Components/Pickups/pickup.hpp index 14bb4434b..556265f09 100644 --- a/Server/Components/Pickups/pickup.hpp +++ b/Server/Components/Pickups/pickup.hpp @@ -156,6 +156,7 @@ class Pickup final : public IPickup, public PoolIDProvider, public NoCopy void setVirtualWorld(int vw) override { virtualWorld = vw; + restream(); } int getID() const override