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

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -3650,5 +3650,17 @@ namespace ReallifeGamemode.Server.Commands
     }
 
     #endregion ALevel1338
+
+    [RemoteEvent("Noclip")]
+    public void Noclip(Player player)
+    {
+      if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
+      {
+        return;
+      }
+      if(player.HasData("Adminduty") && player.GetData<bool>("Adminduty"))
+         player.TriggerEvent("ADMIN:NoClip");
+    }
+
   }
 }

ReallifeGamemode.Server/Commands/FactionCommands.cs

@@ -323,6 +323,12 @@ namespace ReallifeGamemode.Server.Commands
         return;
       }
 
+      if(player.Position.DistanceTo(target.Position) > 3)
+      {
+        ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
+        return;
+      }
+
       if (price < 10 || price > 100)
       {
         ChatService.ErrorMessage(player, "Der Preis muss zwischen 10$ und 100$ liegen");

ReallifeGamemode.Server/Commands/UserCommands.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using GTANetworkAPI;
 using ReallifeGamemode.Database.Entities;
+using ReallifeGamemode.Database.Models;
 using ReallifeGamemode.Server.Extensions;
 using ReallifeGamemode.Server.Finance;
 using ReallifeGamemode.Server.Managers;
@@ -15,6 +16,16 @@ namespace ReallifeGamemode.Server.Commands
 {
   internal class UserCommands : Script
   {
+
+    [Command("skill")]
+    public void CmdUserSkill(Player player)
+    {
+      User user = player.GetUser(new DatabaseContext());
+
+      player.SendChatMessage($"~c~BusSkill = {user.BusSkill}/800, PilotSkill = {user.PilotSkill}/300.");
+      
+    }
+
     [Command("id", "~m~Benutzung: ~s~/id [Name]")]
     public void CmdUserId(Player player, String targetname)
     {