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

ReallifeGamemode.Client/admin/anticheat.ts

@@ -181,7 +181,6 @@
                 let Difference = Behaviour.subtractVector(Behaviour.pos, mp.players.local.position)
                 if (Math.abs(Difference.x) > 30 || Math.abs(Difference.y) > 30) {
                     if (Behaviour.isWalking()) {
-                        mp.gui.chat.push("tp hack");
                         mp.events.callRemote("CLIENT:CheatDetection", "Flyhack/Teleport")
                     }
                 }

ReallifeGamemode.Server/Admin/AntiCheat.cs

@@ -47,5 +47,10 @@ namespace ReallifeGamemode.Server.Admin
     {
       lastAntiCheatBroadcastTime[(name, "Flyhack/Teleport")] = DateTime.Now.Subtract(antiCheatMessageCooldown).Add(TimeSpan.FromSeconds(5));
     }
+
+    internal static void NoHealthAntiCheatForPlayer(string name)
+    {
+      lastAntiCheatBroadcastTime[(name, "Healkey (unexpected HP added)")] = DateTime.Now.Subtract(antiCheatMessageCooldown).Add(TimeSpan.FromSeconds(5));
+    }
   }
 }

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -1324,7 +1324,7 @@ namespace ReallifeGamemode.Server.Commands
         return;
       }
 
-      target.Health = hp;
+      target.SafeSetHealth(hp);
       ChatService.SendMessage(target, "~b~Deine HP wurden von " + player.Name + " auf " + hp + " gesetzt.");
       ChatService.SendMessage(player, "~b~Du hast die HP von " + target.Name + " auf " + hp + " gesetzt.");
     }
@@ -1444,7 +1444,7 @@ namespace ReallifeGamemode.Server.Commands
         dbContext.SaveChanges();
       }
       target.SafeTeleport(target.Position, 0, true);
-      target.Health = 100;
+      target.SafeSetHealth(100);
 
       Medic.delReviveTask(target);
     }
@@ -2010,7 +2010,7 @@ namespace ReallifeGamemode.Server.Commands
       foreach (var managedPlayer in peopleInRange)
       {
         if (!managedPlayer.IsLoggedIn()) return;
-        managedPlayer.Health = hp;
+        managedPlayer.SafeSetHealth(hp);
         ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt.");
       }
       ChatService.SendMessage(player, "~b~Das Leben von " + peopleInRange.Count + " Spielern wurde auf " + hp + " gesetzt.");
@@ -2415,7 +2415,7 @@ namespace ReallifeGamemode.Server.Commands
         ChatService.SendMessage(managedPlayer, toPlayerChat);
 
         managedPlayer.SafeTeleport(managedPlayer.Position, 0, true);
-        managedPlayer.Health = 100;
+        managedPlayer.SafeSetHealth(100);
 
         Medic.delReviveTask(managedPlayer);
       }

ReallifeGamemode.Server/Commands/FactionCommands.cs

@@ -6,6 +6,7 @@ using GTANetworkAPI;
 using Microsoft.EntityFrameworkCore;
 using ReallifeGamemode.Database.Entities;
 using ReallifeGamemode.Database.Models;
+using ReallifeGamemode.Server.Admin;
 using ReallifeGamemode.Server.Extensions;
 using ReallifeGamemode.Server.Factions.Medic;
 using ReallifeGamemode.Server.Managers;
@@ -344,7 +345,7 @@ namespace ReallifeGamemode.Server.Commands
         dbContext.SaveChanges();
       }
       deadPlayer.SafeTeleport(deadPlayer.Position, 0, true);
-      deadPlayer.Health = 50;
+      deadPlayer.SafeSetHealth(50);
 
       MedicTask task = Medic.ReviveTasks.FirstOrDefault(t => t.Victim == deadPlayer.Name);
       Medic.RemoveTaskFromList(task);

ReallifeGamemode.Server/Events/Login.cs

@@ -144,7 +144,7 @@ namespace ReallifeGamemode.Server.Events
             {
               player.TriggerEvent("startDeathTimer", false);
             }
-            player.Health = 0;
+            player.SafeSetHealth(0);
             player.SetData("isDead", true);
           }
           else

ReallifeGamemode.Server/Extensions/ClientExtension.cs

@@ -74,6 +74,12 @@ namespace ReallifeGamemode.Server.Extensions
       }
     }
 
+    public static void SafeSetHealth(this Player player, int health)
+    {
+      AntiCheat.NoHealthAntiCheatForPlayer(player.Name);
+      player.Health = health;
+    }
+
     public static void SetJailTime(this User user, bool killed)
     {
       if (user == null)

ReallifeGamemode.Server/Factions/Medic/Medic.cs

@@ -146,7 +146,7 @@ namespace ReallifeGamemode.Server.Factions.Medic
 
           dbContext.SaveChanges();
         }
-        activeDecision.dTarget.Health = 100;
+        activeDecision.dTarget.SafeSetHealth(100);
         activeDecision.dTarget.SendNotification($"Du wurdest von ~g~{activeDecision.dMedic.Name} ~s~ für ~g~{activeDecision.dPrice.ToMoneyString()} geheilt", false);
         activeDecision.dMedic.SendNotification($"Du hast ~g~{activeDecision.dTarget.Name} ~s~ für {activeDecision.dPrice.ToMoneyString()} geheilt", false);
         delHealTask(activeDecision.dTarget); 

ReallifeGamemode.Server/Inventory/Items/FoodItem.cs

@@ -27,7 +27,7 @@ namespace ReallifeGamemode.Server.Inventory.Items
         amountToAdd = 100 - player.Health;
       }
 
-      player.Health += amountToAdd;
+      player.SafeSetHealth(player.Health + amountToAdd);
       player.SendNotification("Du hast ein/einen ~y~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~gegessen.", false);
       InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1);
     }

ReallifeGamemode.Server/Managers/InteractionManager.cs

@@ -255,15 +255,17 @@ namespace ReallifeGamemode.Server.Managers
 
         if (targetPlayer != null)
         {
-          targetPlayer.SetData("duty", false);
+          targetUser.SetData("duty", false);
           targetPlayer.TriggerEvent("toggleDutyMode", false);
           UpdateCharacterCloth.LoadCharacterDefaults(targetPlayer);
           ChatService.SendMessage(targetPlayer, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
+          FactionHelper.ResetPlayer(targetPlayer, targetUser, dbContext);
         }        
-        targetUser.SetBlipAndNametagColor();
         Medic.UpdateDutyMedics();
         targetUser.FactionRankId = null;
         targetUser.FactionId = null;
+        targetUser.SetBlipAndNametagColor();
+        
         ChatService.SendMessage(player, "!{02FCFF}Du hast " + targetUser.Name + " aus der Fraktion geworfen.");       
 
         dbContext.SaveChanges();

ReallifeGamemode.Server/Util/FactionHelper.cs

@@ -36,9 +36,9 @@ namespace ReallifeGamemode.Server.Util
 
     public static void ResetPlayer(Player player, User user, DatabaseContext dbContext)
     {
-      if (player.GetData<bool>("duty") == true)
+      if (user.GetData<bool>("duty") == true)
       {
-        player.SetData<bool>("duty", false);
+        user.SetData("duty", false);
         Medic.UpdateDutyMedics();
       }
 

ReallifeGamemode.Server/Wanted/Jail.cs

@@ -29,7 +29,7 @@ namespace ReallifeGamemode.Server.Wanted
         player.RemoveAllWeapons();
         player.ClearAttachments();
         player.ClearAnimation();
-        player.Health = 100;
+        player.SafeSetHealth(100);
         player.Armor = 0;
         Random rnd = new Random();
         int rndInt = rnd.Next(1, 3);
@@ -159,7 +159,7 @@ namespace ReallifeGamemode.Server.Wanted
             }
 
             player.TriggerEvent("jailTime", timeMinutes);
-            player.Health = 100;
+            player.SafeSetHealth(100);
           }
         }
       }
@@ -182,7 +182,7 @@ namespace ReallifeGamemode.Server.Wanted
           player.GetUser(dbContext).JailTime = 0;
           dbContext.SaveChanges();
         }
-        player.Health = 100;
+        player.SafeSetHealth(100);
         player.SafeTeleport(new Vector3(427.879, -984.65, 30.71));
 
         ChatService.HQMessage("Beamter " + cop.Name + " hat " + user.Name + " aus dem Knast entlassen.");
@@ -202,7 +202,7 @@ namespace ReallifeGamemode.Server.Wanted
         user.JailTime = 0;
         dbContext.SaveChanges();
 
-        target.Health = 100;
+        target.SafeSetHealth(100);
         target.SafeTeleport(new Vector3(427.879, -984.65, 30.71));
 
         ChatService.HQMessage(" Admin " + admin.Name + " hat " + user.Name + " aus dem Knast entlassen.");