From 30ba5cefc61e6b545c0139f9ae7c5fa977477c90 Mon Sep 17 00:00:00 2001 From: kookroach <62265045+kookroach@users.noreply.github.com> Date: Wed, 14 Apr 2021 21:24:34 +0200 Subject: [PATCH] fix rsethp and blip color --- ReallifeGamemode.Client/Gui/blips.ts | 7 ++++--- ReallifeGamemode.Server/Commands/AdminCommands.cs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/blips.ts b/ReallifeGamemode.Client/Gui/blips.ts index 547b6a10..1c44de47 100644 --- a/ReallifeGamemode.Client/Gui/blips.ts +++ b/ReallifeGamemode.Client/Gui/blips.ts @@ -25,14 +25,15 @@ playerBlipMap.set(player, pBlip); } let pBlip = playerBlipMap.get(player); - let color = player.getVariable("blipColor"); - pBlip.setColour(isNaN(color) ? 0 : color); - pBlip.setPosition(player.position.x, player.position.y, player.position.z); if (player.isDead()) { pBlip.setSprite(303); } else { pBlip.setSprite(1); } + let color = player.getVariable("blipColor"); + pBlip.setColour(isNaN(color) ? 0 : color); + pBlip.setPosition(player.position.x, player.position.y, player.position.z); + }); }, 50); diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 8fcad633..86fa544c 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1976,7 +1976,7 @@ namespace ReallifeGamemode.Server.Commands foreach (var managedPlayer in peopleInRange) { - if (!managedPlayer.IsLoggedIn() || managedPlayer.GetData("isDead")) return; + if (!managedPlayer.IsLoggedIn() || managedPlayer.GetData("isDead")) continue; managedPlayer.SafeSetHealth(hp); ChatService.SendMessage(managedPlayer, "~b~Admin " + player.Name + " hat im Radius von " + radius + " die HP auf " + hp + " gesetzt."); }