From f1c76080ed542b9a0ff489a41f9056eb256e0a40 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Mon, 5 Apr 2021 15:06:24 +0200
Subject: [PATCH] Fix Revive not setting DB

---
 .../Commands/FactionCommands.cs               | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index 147b79dc..4d760f2c 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -296,7 +296,6 @@ namespace ReallifeGamemode.Server.Commands
         return;
       }
 
-      using var dbContext = new DatabaseContext();
       var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(4, player);
       var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
       if (player == deadPlayer)
@@ -310,35 +309,35 @@ namespace ReallifeGamemode.Server.Commands
         ChatService.ErrorMessage(player, "Es wurde kein toter Spieler gefunden");
         return;
       }
-
-      var deadPlayerUser = deadPlayer.GetUser(dbContext);
-
-      if (deadPlayerUser.Handmoney >= 100)
+      using (var dbContext = new DatabaseContext())
       {
-        deadPlayerUser.Handmoney -= 100;
-      }
-      else
-      {
-        int bankMoney = 100 - deadPlayerUser.Handmoney;
-        deadPlayerUser.Handmoney = 0;
-        deadPlayerUser.BankAccount.Balance -= bankMoney;
-      }
+        var deadPlayerUser = deadPlayer.GetUser(dbContext);
 
-      dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome;
+        if (deadPlayerUser.Handmoney >= 100)
+        {
+          deadPlayerUser.Handmoney -= 100;
+        }
+        else
+        {
+          int bankMoney = 100 - deadPlayerUser.Handmoney;
+          deadPlayerUser.Handmoney = 0;
+          deadPlayerUser.BankAccount.Balance -= bankMoney;
+        }
+
+        dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome;
       
-      dbContext.SaveChanges();
+        dbContext.SaveChanges();
 
-      player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0);
+        player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0);
 
-      deadPlayer.TriggerEvent("onPlayerRevived");
-      player.TriggerEvent("destroyMedicTaskCheckpoint");
-      deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt.");
-      player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient.");
-      deadPlayer.SetData("isDead", false);
-      using (var dbContext1 = new DatabaseContext())
-      {
+        deadPlayer.TriggerEvent("onPlayerRevived");
+        player.TriggerEvent("destroyMedicTaskCheckpoint");
+        deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt.");
+        player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient.");
+        deadPlayer.SetData("isDead", false);
+      
         User u;
-        u = deadPlayer.GetUser(dbContext1);
+        u = deadPlayer.GetUser(dbContext);
         u.Dead = false;
         dbContext.SaveChanges();
       }