From 941e2663812cdf64576feb2a15196e885f1b0e94 Mon Sep 17 00:00:00 2001
From: Mac_Slash <maxped1337@gmail.com>
Date: Mon, 13 Apr 2020 14:17:17 +0200
Subject: [PATCH] Fix Sani-!SelfHeal, Fix Duty = 0 wenn Uninvite

---
 ReallifeGamemode.Server/Commands/AdminCommands.cs   |  6 ++++--
 ReallifeGamemode.Server/Commands/FactionCommands.cs | 13 +++++++++----
 .../Managers/InteractionManager.cs                  |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index 71348ed3..6cb74c27 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -1594,8 +1594,10 @@ namespace ReallifeGamemode.Server.Commands
         ChatService.ErrorMessage(player, "Du musst Fahrer sein, um das Menü zu öffnen");
         return;
       }
-
-      player.TriggerEvent("showTuningMenu");
+      else
+      {
+        player.TriggerEvent("showTuningMenu");
+      }
     }
 
     #endregion
diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index 8cef84a8..1ef3514c 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -187,7 +187,7 @@ namespace ReallifeGamemode.Server.Commands
       }
       if (player.IsInVehicle)
       {
-        ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht wiederbeleben");
+        ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht wiederbeleben.");
         return;
       }
 
@@ -196,7 +196,7 @@ namespace ReallifeGamemode.Server.Commands
       var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
       if (player == deadPlayer)
       {
-        ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben");
+        ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben.");
         return;
       }
 
@@ -233,6 +233,7 @@ namespace ReallifeGamemode.Server.Commands
     [Command("heal", "~m~Benutzung: ~s~/heal [Spieler]")] //TODO Eventuell noch mit Geldbetrag wie bei SA:MP
     public void CmdFactionMedicHealive(Player player, string receiver)
     {
+      Player target = PlayerService.GetPlayerByNameOrId(receiver);
       if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
       {
         ChatService.NotAuthorized(player);
@@ -240,10 +241,14 @@ namespace ReallifeGamemode.Server.Commands
       }
       if (player.IsInVehicle)
       {
-        ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen");
+        ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht heilen.");
+        return;
+      }
+      if(player == target)
+      {
+        ChatService.ErrorMessage(player, "Du kannst dich nicht selbst heilen.");
         return;
       }
-      Player target = PlayerService.GetPlayerByNameOrId(receiver);
       target.Health = 100;
       target.SendNotification("Du wurdest von ~g~" + player.Name + " ~s~geheilt.", false);
       player.SendNotification("Du hast ~g~" + target.Name + " ~s~geheilt.", false);
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index 6dfb2d6f..433897d2 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -269,7 +269,7 @@ namespace ReallifeGamemode.Server.Managers
 
           target.GetUser(dbContext).FactionRankId = null;
           target.GetUser(dbContext).FactionId = null;
-
+          target.SetData<bool>("duty", false);
           ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
           ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
           target.SetSharedData("blipColor", 0);