From f006fdffe9ac3cf4cb79fc3cc4c1eca59e95f325 Mon Sep 17 00:00:00 2001 From: kookroach Date: Wed, 14 Apr 2021 03:25:54 +0200 Subject: [PATCH] Stop usage of SetHP and RSetHP on dead people --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 4d4a2e7b..8fcad633 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1285,6 +1285,12 @@ namespace ReallifeGamemode.Server.Commands return; } + if (target.GetData("isDead") == true) + { + ChatService.ErrorMessage(player, "Dieser Spieler ist tot. Nutze /arevive."); + return; + } + 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."); @@ -1970,7 +1976,7 @@ namespace ReallifeGamemode.Server.Commands foreach (var managedPlayer in peopleInRange) { - if (!managedPlayer.IsLoggedIn()) return; + if (!managedPlayer.IsLoggedIn() || managedPlayer.GetData("isDead")) return; managedPlayer.SafeSetHealth(hp); ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); } @@ -2295,7 +2301,7 @@ namespace ReallifeGamemode.Server.Commands nearestItemShopPoint.itemShop.LoadItems(); } - + [Command("rmshopitem", "~m~Benutzung: ~s~/rmshopitem [Item ID]")] public void CmdAdminRemoveItemInShop(Player player, int itemId) { @@ -2324,7 +2330,7 @@ namespace ReallifeGamemode.Server.Commands ShopItem shopItem = dbContext.ShopItems.Where(i => i.ShopId == nearestItemShopPoint.itemShop.id && i.ItemId == item.Id).FirstOrDefault(); - if(shopItem is null) + if (shopItem is null) { return; }