From 940e581f2bbde10c5aa4c0e21e0de0be297dcbfb Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 16 Dec 2018 19:41:21 +0100 Subject: [PATCH] Try fix issues --- Server/Entities/ServerVehicle.cs | 5 +- Server/Entities/ShopVehicles.cs | 5 ++ Server/Events/Login.cs | 78 ++++++++++++++++---------------- Server/Managers/LoadManager.cs | 8 ---- Server/Util/VehicleSync.cs | 3 +- 5 files changed, 49 insertions(+), 50 deletions(-) diff --git a/Server/Entities/ServerVehicle.cs b/Server/Entities/ServerVehicle.cs index 1a592468..1b908172 100644 --- a/Server/Entities/ServerVehicle.cs +++ b/Server/Entities/ServerVehicle.cs @@ -56,12 +56,15 @@ namespace reallife_gamemode.Server.Entities { numberplate = "Shop"; VehicleStreaming.SetLockStatus(veh, false); - Array.ForEach((WindowID[])Enum.GetValues(typeof(WindowID)), x => VehicleStreaming.SetVehicleWindowState(veh, x, WindowState.WindowDown)); + TextLabel label = NAPI.TextLabel.CreateTextLabel(NAPI.Vehicle.GetVehicleDisplayName((VehicleHash)veh.Model) + "\n" + "~g~" + sV.Price.ToMoneyString(), + veh.Position.Add(new Vector3(0, 0, 1.3)), 10.0f, 1f, 1, new Color(255, 255, 255)); } veh.NumberPlate = numberplate; return veh; } + + public abstract override string ToString(); } } diff --git a/Server/Entities/ShopVehicles.cs b/Server/Entities/ShopVehicles.cs index 7f1d173f..096d34d6 100644 --- a/Server/Entities/ShopVehicles.cs +++ b/Server/Entities/ShopVehicles.cs @@ -21,5 +21,10 @@ namespace reallife_gamemode.Server.Entities public int? ShopId { get; set; } public Shop Shop { get; set; } public int Price { get; set; } + + public override string ToString() + { + return "ShopVehicle"; + } } } diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs index 5f165c59..7c091932 100644 --- a/Server/Events/Login.cs +++ b/Server/Events/Login.cs @@ -53,46 +53,46 @@ namespace reallife_gamemode.Server.Events player.SetData("editmode", false); } - var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id); - userBankAccount.Balance = userBankAccount.Balance; + //var userBankAccount = loginUser.UserBankAccounts.SingleOrDefault(u => u.UserId == user.Id); + //userBankAccount.Balance = userBankAccount.Balance; - var userItems = loginUser.UserItems.ToList().FindAll(u => u.UserId == user.Id); - player.SetData("items", userItems); - - if (user.CharacterId == null) - { - var currentPlayerCreatorDimension = (uint) NAPI.Data.GetWorldData("playerCreatorDimension"); - currentPlayerCreatorDimension++; - NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); - player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); - player.Position = new Vector3(402.8664, -996.4108, -99.00027); - player.TriggerEvent("toggleCreator"); - } - else - { - CharacterCreator.ApplyCharacter(player); - UpdateCharacterCloth.LoadCharacterDefaults(player); - NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0); - player.TriggerEvent("draw", player.Name, player.Handle.Value); - } - if (user.Dead == true) - { - if (user.IsAdmin(AdminLevel.ADMIN) == true) - { - player.TriggerEvent("startDeathTimer", true); - player.Health = 0; - } - else - { - player.TriggerEvent("startDeathTimer", false); - player.Health = 0; - } - player.SetData("isDead", true); - } - else - { - player.SetData("isDead", false); - } + //var userItems = loginUser.UserItems.ToList().FindAll(u => u.UserId == user.Id); + //player.SetData("items", userItems); + + //if (user.CharacterId == null) + //{ + // var currentPlayerCreatorDimension = (uint) NAPI.Data.GetWorldData("playerCreatorDimension"); + // currentPlayerCreatorDimension++; + // NAPI.Data.SetWorldData("playerCreatorDimension", currentPlayerCreatorDimension); + // player.Dimension = NAPI.Data.GetWorldData("playerCreatorDimension"); + // player.Position = new Vector3(402.8664, -996.4108, -99.00027); + // player.TriggerEvent("toggleCreator"); + //} + //else + //{ + // CharacterCreator.ApplyCharacter(player); + // UpdateCharacterCloth.LoadCharacterDefaults(player); + NAPI.Player.SpawnPlayer(player, new Vector3(user.PositionX, user.PositionY, user.PositionZ), 0); + // player.TriggerEvent("draw", player.Name, player.Handle.Value); + //} + //if (user.Dead == true) + //{ + // if (user.IsAdmin(AdminLevel.ADMIN) == true) + // { + // player.TriggerEvent("startDeathTimer", true); + // player.Health = 0; + // } + // else + // { + // player.TriggerEvent("startDeathTimer", false); + // player.Health = 0; + // } + // player.SetData("isDead", true); + //} + //else + //{ + // player.SetData("isDead", false); + //} } } } diff --git a/Server/Managers/LoadManager.cs b/Server/Managers/LoadManager.cs index 651d34c6..002831d4 100644 --- a/Server/Managers/LoadManager.cs +++ b/Server/Managers/LoadManager.cs @@ -37,14 +37,6 @@ namespace reallife_gamemode.Server.Managers Vehicle current = veh.Spawn(); TuningManager.ApplyTuningToServerVehicle(veh); - - if (veh is ShopVehicle shopV) - { - string displayName = NAPI.Vehicle.GetVehicleDisplayName(shopV.Model); - NAPI.Vehicle.SetVehicleEngineHealth(current, 0); - var tLabel = NAPI.TextLabel.CreateTextLabel(displayName + " | " + shopV.Price.ToMoneyString(), new Vector3(shopV.PositionX, shopV.PositionY, shopV.PositionZ + 1.5), 10, 1, 0, new Color(255, 255, 255), false); - tLabel.AttachTo(current, "chassis", new Vector3(0, 0, 1.5), new Vector3(0, 0, 0)); - } } } } diff --git a/Server/Util/VehicleSync.cs b/Server/Util/VehicleSync.cs index 1071d900..52306c61 100644 --- a/Server/Util/VehicleSync.cs +++ b/Server/Util/VehicleSync.cs @@ -201,8 +201,7 @@ namespace reallife_gamemode.Server.Util VehicleSyncData data = GetVehicleSyncData(veh); if (data == default(VehicleSyncData)) data = new VehicleSyncData(); - - status = !status; + data.Engine = status; UpdateVehicleSyncData(veh, data); NAPI.ClientEvent.TriggerClientEventInDimension(veh.Dimension, "VehStream_SetEngineStatus", veh, status);