aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
hydrant
2018-10-12 21:36:40 +02:00
parent b6fbecab7c 2dc259ad88
commit eaebb81d37
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Server/Commands/Admin.cs
View File

@@ -831,10 +831,11 @@ namespace reallife_gamemode.Server.Commands
if (!weatherBefore.Equals(weatherAfter)) if (!weatherBefore.Equals(weatherAfter))
{ {
NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter geändert: " + NAPI.World.GetWeather()); NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter geändert: " + NAPI.World.GetWeather());
NAPI.Chat.SendChatMessageToAll("Das Wetter wurde auf " + weatherAfter + " gesetzt!");
} }
else else
{ {
NAPI.Chat.SendChatMessageToPlayer(player, "~w~Wetter konnte nicht geändert werden"); NAPI.Chat.SendChatMessageToPlayer(player, "~w~Das Wetter konnte nicht geändert werden");
} }
} }

16
Server/Managers/LoadManager.cs
View File

@@ -28,10 +28,7 @@ namespace reallife_gamemode.Server.Managers
b.Color, b.Name, b.Alpha, b.DrawDistance, b.ShortRange, (short) b.Rotation, b.Dimension); b.Color, b.Name, b.Alpha, b.DrawDistance, b.ShortRange, (short) b.Rotation, b.Dimension);
} }
} }
} foreach (Saves.SavedVehicle v in loadData.Vehicles)
using (var loadVehicles = new DatabaseContext())
{
foreach (Saves.SavedVehicle v in loadVehicles.Vehicles)
{ {
if (v.Active == true) 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); v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension);
} }
} }
} foreach (FactionVehicle v in loadData.FactionVehicles)
using (var loadFVehicles = new DatabaseContext())
{
foreach (FactionVehicle v in loadFVehicles.FactionVehicles)
{ {
if (v.Active == true) if (v.Active == true)
{ {
NAPI.Vehicle.CreateVehicle((uint)v.Model, new Vector3(v.PositionX, v.PositionY, v.PositionZ), v.Heading, (v.PrimaryColor), 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); v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension);
} }
} }
} }