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

Merge branch 'develop' into 'master'

Browse Source 
HOTFIX RefuseCollector

See merge request log-gtav/reallife-gamemode!61
This commit is contained in:
Siga
2021-04-26 23:10:35 +00:00
parent 5c323c242b 96e12ffd7a
commit 86c545f753
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,11 +71,6 @@ namespace ReallifeGamemode.Server.Events
if (killerUser != null) if (killerUser != null)
{ {
NAPI.Util.ConsoleOutput($"OnPlayerDeath - Player {player.Name} died - Killer GetUser is not null"); NAPI.Util.ConsoleOutput($"OnPlayerDeath - Player {player.Name} died - Killer GetUser is not null");
killerId = killerUser.Id;
killerPosX = killer.Position.X;
killerPosY = killer.Position.Y;
killerPosZ = killer.Position.Z;
killerHeading = killer.Heading;
var playerInGangwar = player.HasData("inGangWar"); var playerInGangwar = player.HasData("inGangWar");
var killerInGangwar = killer.HasData("inGangWar"); var killerInGangwar = killer.HasData("inGangWar");

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

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@@ -212,7 +212,7 @@ namespace ReallifeGamemode.Server.Managers
playerTimersJobVehicleRespawn[player].Stop(); playerTimersJobVehicleRespawn[player].Stop();
playerTimersJobVehicleRespawn.Remove(player); playerTimersJobVehicleRespawn.Remove(player);
} }
else else if (job != GetJob<RefuseCollectorJob>())
{ {
player.StopAnimation(); player.StopAnimation();
player.WarpOutOfVehicle(); player.WarpOutOfVehicle();