From 25a37f03f91878bfa60340199cadedd35066bab1 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 8 Oct 2018 19:01:29 +0200 Subject: [PATCH 1/4] Cleanup LoadManager --- Server/Managers/LoadManager.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Server/Managers/LoadManager.cs b/Server/Managers/LoadManager.cs index 83e05330..1686b3d9 100644 --- a/Server/Managers/LoadManager.cs +++ b/Server/Managers/LoadManager.cs @@ -28,10 +28,7 @@ namespace reallife_gamemode.Server.Managers b.Color, b.Name, b.Alpha, b.DrawDistance, b.ShortRange, (short) b.Rotation, b.Dimension); } } - } - using (var loadVehicles = new DatabaseContext()) - { - foreach (Saves.SavedVehicle v in loadVehicles.Vehicles) + foreach (Saves.SavedVehicle v in loadData.Vehicles) { if (v.Active == true) { @@ -39,15 +36,12 @@ namespace reallife_gamemode.Server.Managers v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension); } } - } - using (var loadFVehicles = new DatabaseContext()) - { - foreach (FactionVehicle v in loadFVehicles.FactionVehicles) + foreach (FactionVehicle v in loadData.FactionVehicles) { if (v.Active == true) - { - NAPI.Vehicle.CreateVehicle((uint)v.Model, new Vector3(v.PositionX, v.PositionY, v.PositionZ), v.Heading, (v.PrimaryColor), - v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension); + { + NAPI.Vehicle.CreateVehicle((uint)v.Model, new Vector3(v.PositionX, v.PositionY, v.PositionZ), v.Heading, (v.PrimaryColor), + v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension); } } } From ec594bc232c08f82b75ba22bcb4d4a51ed9f293f Mon Sep 17 00:00:00 2001 From: xNccPlay Date: Mon, 8 Oct 2018 19:23:34 +0200 Subject: [PATCH 2/4] Add broadcastmessage to setweather command --- Server/Commands/Admin.cs | 2 ++ build.csproj | 23 ----------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 build.csproj diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index d7e80d55..853018f2 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -819,6 +819,8 @@ namespace reallife_gamemode.Server.Commands if (!weatherBefore.Equals(weatherAfter)) { NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter geändert: " + NAPI.World.GetWeather()); + string broadcastMsg = $"Das Wetter wurde auf {weatherAfter} gesetzt!"; + NAPI.Chat.SendChatMessageToAll(broadcastMsg); } else { diff --git a/build.csproj b/build.csproj deleted file mode 100644 index 3d263cde..00000000 --- a/build.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - netcoreapp2.0 - reallife_gamemode - true - true - true - - - - Always - - - - - - - - - - - - \ No newline at end of file From 62e7f6f95967023d64f4eae233a3a35c5a4b4a52 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Mon, 8 Oct 2018 19:26:09 +0200 Subject: [PATCH 3/4] Upload New File --- build.csproj | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 build.csproj diff --git a/build.csproj b/build.csproj new file mode 100644 index 00000000..3d263cde --- /dev/null +++ b/build.csproj @@ -0,0 +1,23 @@ + + + netcoreapp2.0 + reallife_gamemode + true + true + true + + + + Always + + + + + + + + + + + + \ No newline at end of file From c47097ed5a797e20d45e699e9cd9d2bdbe8a977d Mon Sep 17 00:00:00 2001 From: xNccPlay Date: Mon, 8 Oct 2018 19:32:11 +0200 Subject: [PATCH 4/4] Fix broadcastmessage for setweather command --- Server/Commands/Admin.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index e7ac6c70..9ac88ba9 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -831,12 +831,11 @@ namespace reallife_gamemode.Server.Commands if (!weatherBefore.Equals(weatherAfter)) { NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter geändert: " + NAPI.World.GetWeather()); - string broadcastMsg = $"Das Wetter wurde auf {weatherAfter} gesetzt!"; - NAPI.Chat.SendChatMessageToAll(broadcastMsg); + NAPI.Chat.SendChatMessageToAll("Das Wetter wurde auf " + weatherAfter + " gesetzt!"); } else { - NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter konnte nicht geändert werden"); + NAPI.Chat.SendChatMessageToPlayer(player, "~w~Das Wetter konnte nicht geändert werden"); } }