diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 0f598845..afe578e6 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -831,10 +831,11 @@ namespace reallife_gamemode.Server.Commands if (!weatherBefore.Equals(weatherAfter)) { NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter geändert: " + NAPI.World.GetWeather()); + 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"); } } 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); } } }