diff --git a/server/ELS-Server/Properties/AssemblyInfo.cs b/server/ELS-Server/Properties/AssemblyInfo.cs index 667d717..31db0b3 100644 --- a/server/ELS-Server/Properties/AssemblyInfo.cs +++ b/server/ELS-Server/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("els-server")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("ELS Plus Server")] +[assembly: AssemblyDescription("Server side sync for ELS Plus")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("els-server")] +[assembly: AssemblyProduct("ELS Plus Server")] [assembly: AssemblyCopyright("Copyright © 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.3.1")] -[assembly: AssemblyFileVersion("0.1.3.1")] +[assembly: AssemblyVersion("0.2.0.1")] +[assembly: AssemblyFileVersion("0.2.0.1")] diff --git a/src/ELS.cs b/src/ELS.cs index de7152b..14c68a9 100644 --- a/src/ELS.cs +++ b/src/ELS.cs @@ -195,20 +195,19 @@ private void SetupExports() { SpawnCar(veh); })); - } - internal async Task SpawnCar(string veh) + internal async Task SpawnCar(string veh) { if (String.IsNullOrEmpty(veh)) { Screen.ShowNotification("Vehicle not found please try again"); - return; + return null; } if (!VCF.ELSVehicle.Exists(elscar => elscar.modelHash == Game.GenerateHash(veh))) { Screen.ShowNotification("Vehicle not ELS please try again"); - return; + return null; } if (Game.PlayerPed.IsInVehicle()) { @@ -226,6 +225,7 @@ internal async Task SpawnCar(string veh) await polModel.Request(-1); Vehicle _veh = await World.CreateVehicle(polModel, Game.PlayerPed.Position + new Vector3(0f,10f,0f)); Game.PlayerPed.SetIntoVehicle(_veh, VehicleSeat.Driver); + return _veh; } public static string CurrentResourceName() diff --git a/src/Light/Light.Loop.cs b/src/Light/Light.Loop.cs index ceb1ad4..3966876 100644 --- a/src/Light/Light.Loop.cs +++ b/src/Light/Light.Loop.cs @@ -130,7 +130,9 @@ public async void Ticker() public async void ExternalTicker() { - if (crsLights || prmLights || secLights || wrnLights || _extras.TDL.TurnedOn || _extras.SCL.TurnedOn && !_vehicle.IsEngineRunning) + if (crsLights || prmLights || secLights || wrnLights || + (_extras.TDL != null && _extras.TDL.TurnedOn) || (_extras.SCL != null && _extras.SCL.TurnedOn) + && !_vehicle.IsEngineRunning) { _vehicle.IsEngineRunning = true; } diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index fa4d57f..d88e9ea 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.3.1")] -[assembly: AssemblyFileVersion("0.1.3.1")] +[assembly: AssemblyVersion("0.2.0.1")] +[assembly: AssemblyFileVersion("0.2.0.1")]