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

CRASH

Browse Source
This commit is contained in:
hydrant
2020-08-04 18:54:12 +02:00
parent cabe896cb3
commit 301c3847cf
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -230,7 +230,7 @@ namespace ReallifeGamemode.Server.Managers
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
{ {
ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh, context); ServerVehicle serverVehicle = VehicleManager.GetServerVehicleFromVehicle(veh, context);
List<VehicleItem> vehItems = context.VehicleItems.ToList().FindAll(i => i.VehicleId == serverVehicle.Id); List<VehicleItem> vehItems = context.VehicleItems.Where(i => i.VehicleId == serverVehicle.Id).ToList();
foreach (var item in vehItems) foreach (var item in vehItems)
{ {
IItem iItem = GetItemById(item.ItemId); IItem iItem = GetItemById(item.ItemId);
@@ -609,7 +609,7 @@ namespace ReallifeGamemode.Server.Managers
} }
user.Handmoney -= shopItem.Price; user.Handmoney -= shopItem.Price;
dbContext.SaveChanges(); dbContext.SaveChanges();
//client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
} }
} }
} }

8
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -271,7 +271,7 @@ namespace ReallifeGamemode.Server.Managers
{ {
//Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle"); //Vehicle LastVehicle = player.GetData<Vehicle>("LastVehicle");
Vehicle LastVehicle = veh; Vehicle LastVehicle = veh;
JobBase job = GetJob(player.GetUser().JobId ?? -1); JobBase job = GetJob(player?.GetUser()?.JobId ?? -1);
if (LastVehicle == null || job == null) if (LastVehicle == null || job == null)
{ {
return; return;
@@ -531,10 +531,12 @@ namespace ReallifeGamemode.Server.Managers
playerTimersJobVehicleRespawn[player].Stop(); playerTimersJobVehicleRespawn[player].Stop();
} }
CheckPointHandle.DeleteCheckpoints(player); CheckPointHandle.DeleteCheckpoints(player);
if (!player.HasData("LastVehicle")){ if (!player.HasData("LastVehicle"))
{
return; return;
} }
if (player.GetData<Vehicle>("LastVehicle") == null) { if (player.GetData<Vehicle>("LastVehicle") == null)
{
return; return;
} }
player.GetData<Vehicle>("LastVehicle").ResetData("timerJobVehicleRespawn"); player.GetData<Vehicle>("LastVehicle").ResetData("timerJobVehicleRespawn");