From d1c5d8e2bda5f91855c78b5e6e44312a1a4f7f28 Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Tue, 27 Nov 2018 19:12:07 +0100
Subject: [PATCH] Try fix for business error

---
 Server/Commands/Admin.cs           | 12 +++++++-----
 Server/Entities/User.cs            | 11 ++++++-----
 Server/Managers/BusinessManager.cs |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs
index 5dd7a714..a8e4ba5d 100644
--- a/Server/Commands/Admin.cs
+++ b/Server/Commands/Admin.cs
@@ -145,11 +145,12 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-           /* if (target == player) //TODO: wieder reintun, musste testen
+            if (target == player) 
             {
                 ChatService.ErrorMsg(player);
                 return;
-            }*/
+            }
+
             player.SendChatMessage("~y~PM an " + target.Name + ": " + msg + " ");
             string Message = "~y~PM von " + player.GetUser().AdminLevel.GetName() + " " + player.Name + ": " + msg + "";
             NAPI.Chat.SendChatMessageToPlayer(target, Message);
@@ -539,7 +540,7 @@ namespace reallife_gamemode.Server.Commands
 
                 if (ban.Applied == ban.UntilDateTime)
                 {
-                    user.UnbanPlayer(admin);
+                    user.UnbanPlayer();
                 }
                 else
                 {
@@ -550,7 +551,7 @@ namespace reallife_gamemode.Server.Commands
                         return;
                     }
                 }
-                user.UnbanPlayer(admin);
+                user.UnbanPlayer();
             }
 
             string message = "~b~[ADMIN] ~s~Der Spieler ~y~" + user.Name + " ~s~wurde von ~y~" + admin.Name + " ~s~entbannt.";
@@ -801,7 +802,8 @@ namespace reallife_gamemode.Server.Commands
             }
 
             /* TODO: Checken, ob das Fahrzeug in einem System genutzt wird (Fraktions-Autos / Spieler-Auto)
-             * Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat */
+             * Wenn Ja: Abbrechen und mitteilen, dass man den System-spezifischen Befehl zu nutzen hat 
+             */
 
             player.Vehicle.Delete();
         }
diff --git a/Server/Entities/User.cs b/Server/Entities/User.cs
index 246e0d27..a19a9857 100644
--- a/Server/Entities/User.cs
+++ b/Server/Entities/User.cs
@@ -100,14 +100,16 @@ namespace reallife_gamemode.Server.Entities
                 {
                     NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + this.Name + " wurde von " + admin.Name + " permanent gebannt. [" + reason + "]");
                     banUser = new Ban { UserId = this.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp };
-                    //TODO user.Kick(); 
+
+                    GetClient()?.Kick();
+                    
                     mins--;
                 }
                 else
                 {
                     NAPI.Chat.SendChatMessageToAll("!{#FF4040}[BAN] " + this.Name + " wurde von " + admin.Name + " für " + mins + " Minuten gebannt. [" + reason + "]");
                     banUser = new Ban { UserId = this.Id, Reason = reason, BannedBy = admin.Name, Applied = unixTimestamp, UntilDateTime = unixTimestamp + mins * 60 };
-                    //TODO user.Kick(); 
+                    GetClient()?.Kick();
                 }
 
                 banUserContext.Bans.Add(banUser);
@@ -119,12 +121,11 @@ namespace reallife_gamemode.Server.Entities
             }
         }
 
-        public void UnbanPlayer(Client admin)
+        public void UnbanPlayer()
         {
             using (var unbanUser = new DatabaseContext())
             {
-                User user = admin.GetUser();
-                var targetUser = unbanUser.Users.FirstOrDefault(u => u.Id == user.Id);
+                var targetUser = unbanUser.Users.FirstOrDefault(u => u.Id == this.Id);
                 targetUser.BanId = null;
                 unbanUser.SaveChanges();
             }
diff --git a/Server/Managers/BusinessManager.cs b/Server/Managers/BusinessManager.cs
index 7dd56a1f..8e1f4a50 100644
--- a/Server/Managers/BusinessManager.cs
+++ b/Server/Managers/BusinessManager.cs
@@ -60,7 +60,7 @@ namespace reallife_gamemode.Server.Managers
 
             TransactionResult result = BankManager.TransferMoney(user, playerBusiness, amount, "Überweisung");
 
-            if(result == TransactionResult.NEGATIVE_MONEY_SENT)
+            /*if(result == TransactionResult.NEGATIVE_MONEY_SENT)
             {
                 player.SendNotification("~r~Es können nur positive Beträge überwiesen werden");
                 return;
@@ -70,7 +70,7 @@ namespace reallife_gamemode.Server.Managers
                 player.SendNotification("~r~Du hast nicht genug Geld");
                 return;
             }
-            else if(result == TransactionResult.SUCCESS)
+            else */if(result == TransactionResult.SUCCESS)
             {
                 player.TriggerEvent("business_updateMoney", playerBusiness.GetBankAccount().Balance.ToMoneyString());
                 player.SendNotification("~g~Du hast erfolgreich ~s~" + amount.ToMoneyString() + " ~g~ überwiesen");