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

ReallifeGamemode.Client/core/rage-mp/game.ts

@@ -10,8 +10,8 @@ export default class RageGame implements IGame {
     events: IEvents = new RageEvents;
     ui: IUi = new RageUi;
 
-    wait(ms: number): void {
-        mp.game.waitAsync(ms);
+    async wait(ms: number): Promise<void> {
+        await mp.game.waitAsync(ms);
     }
 
     disableDefaultEngineBehaviour(): void {

ReallifeGamemode.Client/game.ts

@@ -1,5 +1,5 @@
 interface IGame {
-    wait(ms: number);
+    wait(ms: number): Promise<void>;
     events: IEvents;
     ui: IUi;
 

ReallifeGamemode.Client/vehiclesync/vehiclesync.ts

@@ -10,9 +10,9 @@ game.events.add('SERVER:Vehicle:UpdateData', (vehId, dataStr) => {
     setVehicleData(vehicle, data);
 });
 
-game.events.onPlayerEnterVehicle((vehicle, seat) => {
+game.events.onPlayerEnterVehicle(async (vehicle, seat) => {
     while (!game.players.local.inVehicle) {
-        game.wait(0);
+        await game.wait(0);
     }
 
     if (vehicle) {
@@ -22,11 +22,11 @@ game.events.onPlayerEnterVehicle((vehicle, seat) => {
     }
 });
 
-game.events.onPlayerExitVehicle(() => {
+game.events.onPlayerExitVehicle(async () => {
     var veh = game.players.local.vehicle;
 
     while (game.players.local.inVehicle) {
-        game.wait(0);
+        await game.wait(0);
     }
 
     if (veh) {

ReallifeGamemode.Server/Events/Key.cs

@@ -560,7 +560,8 @@ namespace ReallifeGamemode.Server.Events
             player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
             return;
           }
-        } else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
+        } 
+        else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
         {
           if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
           {
@@ -578,11 +579,6 @@ namespace ReallifeGamemode.Server.Events
               return;
             }
           }
-          else
-          {
-            player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
-            return;
-          }
           if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
           {
             if (job.GetUsersInJob().Contains(player))
@@ -598,7 +594,7 @@ namespace ReallifeGamemode.Server.Events
               player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
               return;
             }
-            }
+          }
           else
           {
             player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");

ReallifeGamemode.Server/Job/RefuseCollectorJob.cs

@@ -19,7 +19,7 @@ namespace ReallifeGamemode.Server.Job
 
     public override bool NeedVehicleToStart => false;
 
-    const int MAX_BAG = 50;
+    const int MAX_BAG = 40;
 
     public RefuseCollectorJob()
     {