[#258] disable kill when player is protected by angel guardian

BitCrackers · Dec 17, 2021 · 288596d · 288596d
1 parent 4668a9e
commit 288596d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/gui/tabs/players_tab.cpp b/gui/tabs/players_tab.cpp
@@ -162,7 +162,8 @@ namespace PlayersTab {
 					}
 
 					if (IsInGame() && PlayerIsImpostor(GetPlayerData(*Game::pLocalPlayer)) && !State.selectedPlayer.get_PlayerData()->fields.IsDead
-						&& !GetPlayerData(*Game::pLocalPlayer)->fields.IsDead && ((*Game::pLocalPlayer)->fields.killTimer <= 0.0f))
+						&& !GetPlayerData(*Game::pLocalPlayer)->fields.IsDead && ((*Game::pLocalPlayer)->fields.killTimer <= 0.0f)
+						&& !State.selectedPlayer.get_PlayerControl()->fields.protectedByGuardian)
 					{
 						if (ImGui::Button("Kill Player"))
 						{

diff --git a/user/gitparams.h b/user/gitparams.h
@@ -1,2 +1,2 @@
-#define GIT_CUR_COMMIT dd02efaa502cf8d64c81bf179ebcdacdbc937f2a
-#define GIT_BRANCH main
+#define GIT_CUR_COMMIT 4668a9eb2a178a5b4884eadbda78508c8ce3bb19
+#define GIT_BRANCH feature/check_protected_player