From cf8b54a3b55d9f1ecd0ca3bcb102df1728245119 Mon Sep 17 00:00:00 2001 From: Sardelka Date: Tue, 12 Jul 2022 17:10:16 +0800 Subject: [PATCH] Fix WeatherTimeSync option --- RageCoop.Server/Scripting/BaseScript.cs | 13 +++++++++---- RageCoop.Server/ServerSettings.cs | 9 ++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/RageCoop.Server/Scripting/BaseScript.cs b/RageCoop.Server/Scripting/BaseScript.cs index 056397c..a4a1fba 100644 --- a/RageCoop.Server/Scripting/BaseScript.cs +++ b/RageCoop.Server/Scripting/BaseScript.cs @@ -10,6 +10,8 @@ namespace RageCoop.Server.Scripting { internal class BaseScript:ServerScript { + private readonly Server Server; + public BaseScript(Server server) { Server=server; } public override void OnStart() { API.RegisterCustomEventHandler(CustomEvents.NativeResponse, NativeResponse); @@ -23,13 +25,16 @@ namespace RageCoop.Server.Scripting }); API.RegisterCustomEventHandler(CustomEvents.WeatherTimeSync, (e) => { - foreach(var c in API.GetAllClients().Values) + if (Server.Settings.WeatherTimeSync) { - if (c==e.Sender) + foreach (var c in API.GetAllClients().Values) { - continue; + if (c==e.Sender) + { + continue; + } + c.SendCustomEventQueued(CustomEvents.WeatherTimeSync, e.Args); } - c.SendCustomEventQueued(CustomEvents.WeatherTimeSync,e.Args); } }); } diff --git a/RageCoop.Server/ServerSettings.cs b/RageCoop.Server/ServerSettings.cs index 0a6ac50..56c7e45 100644 --- a/RageCoop.Server/ServerSettings.cs +++ b/RageCoop.Server/ServerSettings.cs @@ -76,13 +76,8 @@ public float PlayerStreamingDistance { get; set; } = -1; /// - /// If enabled, all clients will have same weather as host + /// If enabled, all clients will have same weather and time as host /// - public bool WeatherSync { get; set; } = true; - - /// - /// If enabled, all clients will have same time as host - /// - public bool TimeSync { get; set; } = true; + public bool WeatherTimeSync { get; set; } = true; } }