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

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(<number>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);
     }
 }

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);