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

Try fix issues

Browse Source
This commit is contained in:
hydrant
2018-12-16 19:41:21 +01:00
parent b385883379
commit 940e581f2b
5 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Server/Entities/ServerVehicle.cs
View File

@@ -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();
}
}

5
Server/Entities/ShopVehicles.cs
View File

@@ -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";
}
}
}

76
Server/Events/Login.cs
View File

@@ -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);
//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);
}
//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);
//}
}
}
}

8
Server/Managers/LoadManager.cs
View File

@@ -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));
}
}
}
}

1
Server/Util/VehicleSync.cs
View File

@@ -202,7 +202,6 @@ namespace reallife_gamemode.Server.Util
if (data == default(VehicleSyncData))
data = new VehicleSyncData();
status = !status;
data.Engine = status;
UpdateVehicleSyncData(veh, data);
NAPI.ClientEvent.TriggerClientEventInDimension(veh.Dimension, "VehStream_SetEngineStatus", veh, status);