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

prevent nullreference in exitvehicle

Browse Source
This commit is contained in:
hydrant
2021-05-18 00:11:30 +02:00
parent 1e623f8fa9
commit 4cf6127d08
2 changed files with 30 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs
View File

@@ -228,7 +228,6 @@ namespace ReallifeGamemode.Server.Events
} }
else else
{ {
ExitVehicle.timerNoobRollerRespawn.Stop();
vehicle.SetData("NoobSpawnVehicleTimer", false); vehicle.SetData("NoobSpawnVehicleTimer", false);
} }
} }

79
ReallifeGamemode.Server/Events/ExitVehicle.cs
View File

@@ -15,21 +15,41 @@ namespace ReallifeGamemode.Server.Events
{ {
public class ExitVehicle : Script public class ExitVehicle : Script
{ {
object LastVehicle;
public static Timer timerNoobRollerRespawn = new Timer(600000); //10 Minuten Timer NoobRollerRespawn
[ServerEvent(Event.PlayerExitVehicleAttempt)] [ServerEvent(Event.PlayerExitVehicleAttempt)]
public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle) public void OnPlayerExitVehicle(Player client, GTANetworkAPI.Vehicle vehicle)
{ {
LastVehicle = vehicle; if (client == null)
if (client.VehicleSeat != 0) {
return; return;
}
if (vehicle.GetServerVehicle() is FactionVehicle veh) if (client.VehicleSeat != 0)
{
return;
}
if (vehicle == null)
{
return;
}
ServerVehicle serverVehicle = vehicle.GetServerVehicle();
if (serverVehicle == null)
{
return;
}
if (serverVehicle is FactionVehicle factionVehicle)
{ {
User u = client.GetUser(); User u = client.GetUser();
if (u == null)
{
return;
}
if ((u.FactionId != null) if ((u.FactionId != null)
&& (veh.GetOwners().Contains(u.FactionId ?? 0)) && (factionVehicle.GetOwners().Contains(u.FactionId ?? 0))
&& (veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) && (factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH)
&& vehicle.HasData("weaponDeal") && vehicle.HasData("weaponDeal")
&& vehicle.GetData<bool>("weaponDeal") == true) && vehicle.GetData<bool>("weaponDeal") == true)
{ {
@@ -37,7 +57,7 @@ namespace ReallifeGamemode.Server.Events
client.TriggerEvent("destroyCP"); client.TriggerEvent("destroyCP");
} }
else if ((u.FactionId != null) else if ((u.FactionId != null)
&& (veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) && (factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || factionVehicle.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH)
&& vehicle.HasData("WeaponDealLoad") && vehicle.HasData("WeaponDealLoad")
&& vehicle.GetData<bool>("WeaponDealLoad") == true) && vehicle.GetData<bool>("WeaponDealLoad") == true)
{ {
@@ -45,7 +65,7 @@ namespace ReallifeGamemode.Server.Events
} }
client.TriggerEvent("CheckWaterCrash", vehicle); client.TriggerEvent("CheckWaterCrash", vehicle);
} }
if (vehicle.GetServerVehicle() is SchoolVehicle vehS) if (serverVehicle is SchoolVehicle schoolVehicle)
{ {
if (client.HasData("ActiveSchool")) if (client.HasData("ActiveSchool"))
{ {
@@ -58,22 +78,13 @@ namespace ReallifeGamemode.Server.Events
CheckPointHandle.DeleteCheckpoints(client); CheckPointHandle.DeleteCheckpoints(client);
} }
} }
if (vehicle.GetData<bool>("NoobSpawnVehicle") == true)
{
timerNoobRollerRespawn.Start();
vehicle.SetData("NoobSpawnVehicleTimer", true);
timerNoobRollerRespawn.AutoReset = false;
timerNoobRollerRespawn.Elapsed += Timer600000_Elapsed;
//LastVehicle = vehicle;
//timerNoobRollerRespawn.Elapsed += async (sender, e) => {await
}
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext())
{ {
ServerVehicle sV = vehicle.GetServerVehicle(dbContext); ServerVehicle sV = vehicle.GetServerVehicle(dbContext);
if (sV is UserVehicle) if (sV is UserVehicle)
{ {
Vector3 pos = vehicle.Position; Vector3 pos = vehicle.Position;
sV.PositionX = pos.X; sV.PositionX = pos.X;
@@ -86,35 +97,5 @@ namespace ReallifeGamemode.Server.Events
} }
} }
} }
private static void Timer600000_Elapsed(object sender, ElapsedEventArgs e)
{
//ExitVehicle c = new ExitVehicle();
//Vehicle veh = c.LastVehicle;
NAPI.Task.Run(() =>
{
NAPI.Pools.GetAllVehicles().ForEach(v =>
{
if (v.GetData<bool>("NoobSpawnVehicle") == true)
{
if (v.GetData<bool>("NoobSpawnVehicleTimer") == true)
{
v.ResetData("NoobSpawnVehicleTimer");
v.ResetData("NoobSpawnVehicle");
VehicleManager.DeleteVehicle(v);
}
}
});
NAPI.Pools.GetAllPlayers().ForEach(p =>
{
//if (!p.IsInVehicle)
//{
if (p.GetData<bool>("HatNoobSpawnVehicle") == true)
{
p.ResetData("HatNoobSpawnVehicle");
}
//}
});
});
}
} }
} }