aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop usage of SetHP and RSetHP on dead people

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-14 03:25:54 +02:00
parent 55f97af379
commit f006fdffe9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1285,6 +1285,12 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
if (target.GetData<bool>("isDead") == true)
{
ChatService.ErrorMessage(player, "Dieser Spieler ist tot. Nutze /arevive.");
return;
}
target.SafeSetHealth(hp); target.SafeSetHealth(hp);
ChatService.SendMessage(target, "~b~Deine HP wurden von " + player.Name + " auf " + hp + " gesetzt."); 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."); 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) foreach (var managedPlayer in peopleInRange)
{ {
if (!managedPlayer.IsLoggedIn()) return; if (!managedPlayer.IsLoggedIn() || managedPlayer.GetData<bool>("isDead")) return;
managedPlayer.SafeSetHealth(hp); managedPlayer.SafeSetHealth(hp);
ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); 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(); nearestItemShopPoint.itemShop.LoadItems();
} }
[Command("rmshopitem", "~m~Benutzung: ~s~/rmshopitem [Item ID]")] [Command("rmshopitem", "~m~Benutzung: ~s~/rmshopitem [Item ID]")]
public void CmdAdminRemoveItemInShop(Player player, int itemId) 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(); 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; return;
} }