From 7d68532b74464f821099e665416f5f2bea6dcc42 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 15:36:56 +0200 Subject: [PATCH 1/2] =?UTF-8?q?gef=C3=A4ngnis=20pc=20nullreference=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Events/Key.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 41e08be7..e5aef019 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -513,6 +513,11 @@ namespace ReallifeGamemode.Server.Events foreach (Player target in NAPI.Pools.GetAllPlayers()) { User c = target.GetUser(); + if(c == null) + { + continue; + } + if (c.JailTime > 0) { criminals.Add(c.Name); From 88cf30897ceb739bdee6edf55b1751e2ee0666d0 Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 5 Apr 2021 15:57:55 +0200 Subject: [PATCH 2/2] fix expired vehicle error --- .../core/rage-mp/entities.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ReallifeGamemode.Client/core/rage-mp/entities.ts b/ReallifeGamemode.Client/core/rage-mp/entities.ts index df59090c..537c765e 100644 --- a/ReallifeGamemode.Client/core/rage-mp/entities.ts +++ b/ReallifeGamemode.Client/core/rage-mp/entities.ts @@ -203,26 +203,50 @@ class RageVehicle extends RageEntity implements IVehicle { } isSeatFree(seat: VehicleSeat): boolean { + if (!mp.vehicles.exists(this.vehicle)) { + return false; + } + return this.vehicle.isSeatFree(seat - 1); } setEngineStatus(status: boolean, instantly: boolean, otherwise: boolean) { + if (!mp.vehicles.exists(this.vehicle)) { + return false; + } + this.vehicle.setEngineOn(status, instantly, otherwise); } setUndriveable(status: boolean) { + if (!mp.vehicles.exists(this.vehicle)) { + return false; + } + this.vehicle.setUndriveable(status); } setDoorsLocked(state: boolean) { + if (!mp.vehicles.exists(this.vehicle)) { + return false; + } + this.vehicle.setDoorsLocked(state ? 2 : 1); } setDoorOpen(door: number, loose: boolean, instantly: boolean) { + if (!mp.vehicles.exists(this.vehicle)) { + return false; + } + this.vehicle.setDoorOpen(door, loose, instantly); } setDoorShut(door: number, instantly: boolean) { + if (!mp.vehicles.exists(this.vehicle)) { + return false; + } + this.vehicle.setDoorShut(door, instantly); } }