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

Fix RefuseCollector Job Server Side

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-05 17:28:46 +02:00
parent 2ddeb289f4
commit c203a51e2f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -99,7 +99,7 @@ namespace ReallifeGamemode.Server.Events
{ {
//if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true) //if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
//{ //{
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ && job.Id == JobManager.GetJob<RefuseCollectorJob>().Id)
{ {
player.Vehicle.ResetData("timerJobVehicleRespawn"); player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);

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

@@ -13,8 +13,6 @@ using ReallifeGamemode.Server.Util;
using ReallifeGamemode.Services; using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Types;
namespace ReallifeGamemode.Server.Managers namespace ReallifeGamemode.Server.Managers
{ {
public class JobManager : Script public class JobManager : Script
@@ -210,6 +208,7 @@ namespace ReallifeGamemode.Server.Managers
playerJobStartPosition[player] = player.Position; playerJobStartPosition[player] = player.Position;
job.StartJob(player); job.StartJob(player);
} }
[ServerEvent(Event.PlayerExitVehicle)] [ServerEvent(Event.PlayerExitVehicle)]
public void JobManagerPlayerExitVehicle(Player player, Vehicle veh) public void JobManagerPlayerExitVehicle(Player player, Vehicle veh)
{ {
@@ -298,10 +297,14 @@ namespace ReallifeGamemode.Server.Managers
if (vehJ.GetJob().GetUsersInJob().Contains(player)) if (vehJ.GetJob().GetUsersInJob().Contains(player))
{ {
if (LastVehicle != null) if (LastVehicle != null)
{
if (job.Id != 2) //Müllman Handelt Fahrzeug respawn eigenständig
{ {
LastVehicle.ResetData("timerJobVehicleRespawn"); LastVehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle);
ServerVehicleExtensions.Spawn(sVeh, LastVehicle); ServerVehicleExtensions.Spawn(sVeh, LastVehicle);
}
job.StopJob(player); job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player); CheckPointHandle.DeleteCheckpoints(player);