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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-22 19:52:02 +02:00
parent 3b04a0776e 4060ffb7fb
commit 80f851250b
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -196,6 +196,7 @@ namespace ReallifeGamemode.Server.Managers
SecondaryColor = 111,
Active = true,
Price = price,
BusinessId = business.Id
};
}
else if (target == "Fraktion")

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

@@ -202,13 +202,22 @@ namespace ReallifeGamemode.Server.Managers
{
JobBase job = GetJob(player.GetUser().JobId ?? -1);
if (job != null && job.GetUsersInJob().Contains(player) && job.CheckVehicle(player, veh) && seat == 0)
if (job != null && job.GetUsersInJob().Contains(player) && seat == 0)
{
if (!playerTimersJobVehicleRespawn.ContainsKey(player))
return;
if(job.CheckVehicle(player, veh))
{
if (!playerTimersJobVehicleRespawn.ContainsKey(player))
return;
playerTimersJobVehicleRespawn[player].Stop();
playerTimersJobVehicleRespawn.Remove(player);
playerTimersJobVehicleRespawn[player].Stop();
playerTimersJobVehicleRespawn.Remove(player);
}
else
{
player.StopAnimation();
player.WarpOutOfVehicle();
player.Position = player.Position.Add(new Vector3(0, 0, 2.0f));
}
}
}