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

VehicleDeath Debug

Browse Source
This commit is contained in:
Mac_Slash
2020-05-04 23:29:28 +02:00
parent 904f1cf818
commit d5895d864d
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -126,8 +126,8 @@ namespace ReallifeGamemode.Server.Events
{*/ {*/
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
ChatService.SendMessage(player, "Debug4"); ChatService.SendMessage(player, "Debug4");
player.Vehicle.ResetData("timerJobVehicleRespawn"); player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = Managers.VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); ServerVehicle sVeh = Managers.VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
ServerVehicleExtensions.Spawn(sVeh, player.Vehicle); ServerVehicleExtensions.Spawn(sVeh, player.Vehicle);
} }

4
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -578,7 +578,7 @@ namespace ReallifeGamemode.Server.Events
{ {
player.SendChatMessage(""); player.SendChatMessage("");
}*/ }*/
if (jV.JobId == 3 && player.GetUser().JobId == 3) if (jV.JobId == 3 && player.GetUser().JobId == 3 && jV.GetJob().GetUsersInJob().Contains(player))
{ {
Job.PilotJob c = new Job.PilotJob(); Job.PilotJob c = new Job.PilotJob();
if ((VehicleHash)jV.Model == VehicleHash.Cuban800 && !state) if ((VehicleHash)jV.Model == VehicleHash.Cuban800 && !state)
@@ -606,7 +606,7 @@ namespace ReallifeGamemode.Server.Events
} }
} }
} }
if (jV.JobId == 4 && player.GetUser().JobId == 4) if (jV.JobId == 4 && player.GetUser().JobId == 4 && jV.GetJob().GetUsersInJob().Contains(player))
{ {
Job.BusDriverJob c = new Job.BusDriverJob(); Job.BusDriverJob c = new Job.BusDriverJob();
if ((VehicleHash)jV.Model == VehicleHash.Bus && !state) if ((VehicleHash)jV.Model == VehicleHash.Bus && !state)

5
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -868,16 +868,19 @@ namespace ReallifeGamemode.Server.Managers
public static void VehicleManagerVehicleDeath(Vehicle vehicle) public static void VehicleManagerVehicleDeath(Vehicle vehicle)
{ {
ServerVehicle serverVehicle = GetServerVehicleFromVehicle(vehicle); ServerVehicle serverVehicle = GetServerVehicleFromVehicle(vehicle);
vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 1");
if (serverVehicle == null) if (serverVehicle == null)
{ {
vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 2");
vehicle.Delete(); vehicle.Delete();
return; return;
} }
vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 3");
Vehicle newVeh = serverVehicle.Spawn(vehicle); Vehicle newVeh = serverVehicle.Spawn(vehicle);
newVeh.Repair(); newVeh.Repair();
newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading);
vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 4");
} }