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

ReallifeGamemode.Client/Interaction/factioninteraction.ts

@@ -469,11 +469,13 @@ export default function factionInteraction(globalData: IGlobalData) {
     });
 
     mp.events.add("destroyMedicTaskCheckpoint", () => {       
+        if (activeCheckpoint) {
             activeCheckpoint.destroy(); 
             activeCheckpoint = null;
             activeTask = null;
             timeLeft = null;
             mp.events.callRemote("MedicTaskTimeout"); 
+        }
     });
 
     mp.events.add('playerEnterCheckpoint', (activeCheckpoint) => {

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -2025,6 +2025,30 @@ namespace ReallifeGamemode.Server.Commands
       ChatService.SendMessage(player, "~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt.");
     }
 
+    [Command("rsetwage", "~m~Benutzung: ~s~/rsetwage [Radius] (Verdienst)")]
+    public void CmdAdminRangeSetWage(Player player, float radius, int wage)
+    {
+      if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
+      {
+        ChatService.NotAuthorized(player);
+        return;
+      }
+      var peopleInRange = NAPI.Player.GetPlayersInRadiusOfPlayer(radius, player);
+
+      using (var dbContext = new DatabaseContext())
+      {
+        foreach (var managedPlayer in peopleInRange)
+        {
+          if (!managedPlayer.IsLoggedIn()) return;
+          managedPlayer.GetUser(dbContext).Wage += wage;
+          
+          ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " den Verdienst um $" + wage + " erhöht.");
+          dbContext.SaveChanges();
+        }
+      }
+      ChatService.SendMessage(player, "~b~Der Verdienst von " + peopleInRange.Count + " Spielern wurde um $" + wage + " erhöht.");
+    }
+
     [Command("setweather", "~m~Benutzung: ~s~/setweather [Wetter]")]
     public void CmdAdminSetweather(Player player, string weather)
     {
@@ -3422,7 +3446,7 @@ namespace ReallifeGamemode.Server.Commands
 
       using (var dbContext = new DatabaseContext())
       {
-        target.GetUser(dbContext).Wage = wage;
+        target.GetUser(dbContext).Wage += wage;
         dbContext.SaveChanges();
       }
     }