fix: check if player is alive or controlled before doing certain actions

winstxnhdw · Dec 21, 2023 · 97fcf29 · 97fcf29
1 parent 6f9cf9a
commit 97fcf29
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/lc-hax/Scripts/Commands/ChibakuTenseiCommand.cs b/lc-hax/Scripts/Commands/ChibakuTenseiCommand.cs
@@ -7,7 +7,7 @@ public class ChibakuTenseiCommand : ICommand {
     Vector3 spinningY = new(0, 2, 0);
 
     Result TeleportPlayerToRandom(string[] args) {
-        if (!Helper.GetPlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
+        if (!Helper.GetActivePlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
             return new Result(message: "Player not found!");
         }
 

diff --git a/lc-hax/Scripts/Commands/HateCommand.cs b/lc-hax/Scripts/Commands/HateCommand.cs
@@ -10,7 +10,7 @@ public void Execute(string[] args) {
             return;
         }
 
-        if (!Helper.GetPlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
+        if (!Helper.GetActivePlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
             Console.Print("Player not found!");
             return;
         }

diff --git a/lc-hax/Scripts/Commands/KillCommand.cs b/lc-hax/Scripts/Commands/KillCommand.cs
@@ -9,7 +9,7 @@ void KillPlayer(PlayerControllerB player) =>
         player.DamagePlayerFromOtherClientServerRpc(1000, Vector3.zero, -1);
 
     Result KillSelf() {
-        if (!Helper.LocalPlayer.IsNotNull(out PlayerControllerB localPlayer)) {
+        if (!Helper.LocalPlayer.IsNotNull(out PlayerControllerB localPlayer) || localPlayer.isPlayerDead) {
             return new Result(message: "Player not found!");
         }
 
@@ -18,7 +18,7 @@ Result KillSelf() {
     }
 
     Result KillTargetPlayer(string[] args) {
-        if (!Helper.GetPlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
+        if (!Helper.GetActivePlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
             return new Result(message: "Player not found!");
         }
 

diff --git a/lc-hax/Scripts/Commands/NoiseCommand.cs b/lc-hax/Scripts/Commands/NoiseCommand.cs
@@ -14,7 +14,7 @@ public void Execute(string[] args) {
             return;
         }
 
-        if (!Helper.GetPlayer(args[0]).IsNotNull(out PlayerControllerB player)) {
+        if (!Helper.GetActivePlayer(args[0]).IsNotNull(out PlayerControllerB player)) {
             Console.Print("Player not found!");
             return;
         }

diff --git a/lc-hax/Scripts/Commands/RandomCommand.cs b/lc-hax/Scripts/Commands/RandomCommand.cs
@@ -58,7 +58,7 @@ bool InverseTeleporterExists() {
     }
 
     Action TeleportPlayerToRandomLater(string[] args) => () => {
-        if (!Helper.GetPlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
+        if (!Helper.GetActivePlayer(args[0]).IsNotNull(out PlayerControllerB targetPlayer)) {
             Console.Print("Player not found!");
             return;
         }

diff --git a/lc-hax/Scripts/Helpers/Players.cs b/lc-hax/Scripts/Helpers/Players.cs
@@ -16,4 +16,11 @@ public static partial class Helper {
     }
 
     public static PlayerControllerB? GetPlayer(int playerId) => Helper.GetPlayer(playerId.ToString());
+
+    public static PlayerControllerB? GetActivePlayer(string playerNameOrId) =>
+        !Helper.GetPlayer(playerNameOrId).IsNotNull(out PlayerControllerB player)
+            ? null
+            : player.isPlayerDead ? null : !player.isPlayerControlled ? null : player;
+
+    public static PlayerControllerB? GetActivePlayer(int playerId) => Helper.GetActivePlayer(playerId.ToString());
 }
diff --git a/lc-hax/Scripts/Modules/PhantomMod.cs b/lc-hax/Scripts/Modules/PhantomMod.cs
@@ -35,7 +35,7 @@ void LookAtPlayer(int indexChange) {
         int playerCount = Helper.Players?.Length ?? 0;
         this.CurrentSpectatorIndex = (this.CurrentSpectatorIndex + indexChange) % playerCount;
 
-        if (!Helper.GetPlayer(this.CurrentSpectatorIndex).IsNotNull(out PlayerControllerB targetPlayer)) {
+        if (!Helper.GetActivePlayer(this.CurrentSpectatorIndex).IsNotNull(out PlayerControllerB targetPlayer)) {
             Console.Print("Player not found!");
             return;
         }