From 865d5465c13f3add4d965b47f703a4590f113b14 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Sat, 22 Sep 2018 23:38:19 +0200 Subject: [PATCH] Fix meta.xml again, optimized LoadManager --- Server/Managers/LoadManager.cs | 17 ++++++--------- meta.xml | 40 +++++++++++++++++----------------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Server/Managers/LoadManager.cs b/Server/Managers/LoadManager.cs index 249b852a..4384c916 100644 --- a/Server/Managers/LoadManager.cs +++ b/Server/Managers/LoadManager.cs @@ -17,11 +17,11 @@ namespace reallife_gamemode.Server.Managers { [ServerEvent(Event.ResourceStart)] public void OnResourceStart() - { - //LOAD ALL BLIPS - using (var loadBlips = new DatabaseContext()) + { + using (var loadData = new DatabaseContext()) { - foreach (Saves.SavedBlip b in loadBlips.Blips) + //LOAD ALL BLIPS + foreach (Saves.SavedBlip b in loadData.Blips) { if(b.Active == true) { @@ -29,15 +29,12 @@ namespace reallife_gamemode.Server.Managers b.Color, b.Name, b.Alpha, b.DrawDistance, b.ShortRange, (short) b.Rotation, b.Dimension); } } - } - //LOAD ALL VEHICLES - using (var loadVehicles = new DatabaseContext()) - { - foreach (Saves.SavedVehicle v in loadVehicles.Vehicles) + //LOAD ALL VEHICLES + foreach (Saves.SavedVehicle v in loadData.Vehicles) { if (v.Active == true) { - NAPI.Vehicle.CreateVehicle((uint) v.Model, new Vector3(v.PositionX, v.PositionY, v.PositionZ), v.Heading, (int)(v.PrimaryColor), + NAPI.Vehicle.CreateVehicle((uint)v.Model, new Vector3(v.PositionX, v.PositionY, v.PositionZ), v.Heading, (int)(v.PrimaryColor), v.SecondaryColor, v.NumberPlate, v.Alpha, v.Locked, v.Engine = false, v.Dimension); } } diff --git a/meta.xml b/meta.xml index c0829ca3..d83c4bf5 100644 --- a/meta.xml +++ b/meta.xml @@ -6,42 +6,42 @@ -