From 66c71eb098e19f975388fb811d59a48a641dccb5 Mon Sep 17 00:00:00 2001
From: Ashby Issac <ashby@alantrixgeim.com>
Date: Mon, 23 Feb 2026 16:09:23 +0530
Subject: [PATCH] NullRefFix: Gameplay.

While selecting PvsAI and selecting green, got a null ref due to wrong currentPlayerTurnIndex be passed on.
---
 Assets/Scripts/Gameplay/GameplayManager.cs          | 5 +++--
 Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/Gameplay/GameplayManager.cs b/Assets/Scripts/Gameplay/GameplayManager.cs
index 3aad0d8..e487239 100644
--- a/Assets/Scripts/Gameplay/GameplayManager.cs
+++ b/Assets/Scripts/Gameplay/GameplayManager.cs
@@ -264,7 +264,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
             // SetCanRollDiceForUser(!isBotTurn); // TODO :: Need to change
             if (isBotTurn)
             {
-                currentPlayerTurnTimer.KillTimer();
+                currentPlayerTurnTimer?.KillTimer();
                 uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn);
                 return;
             }
@@ -302,11 +302,12 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
 
     private void ResetCurrentPlayerTurnTimer()
     {
-        currentPlayerTurnTimer.KillTimer();
+        currentPlayerTurnTimer?.KillTimer();
     }
 
     public void InitCurrentGamePlayerInfo()
     {
+        currentPlayerTurnIndex = 0;
         UpdateCurrentPlayerTurn(allPlayerTypes[currentPlayerTurnIndex]);
         SetCanRollDiceForUser(IsUsersTurn());
         UpdateDiceView();
diff --git a/Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs b/Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs
index 709f3db..221ce05 100644
--- a/Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs
+++ b/Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs
@@ -56,6 +56,7 @@ public class PlayerBaseHandler : MonoBehaviour
 
     public void ShowSelectedPlayerBase(PlayerType playerType, bool state)
     {
-        playerBasesDict[playerType].ShowPlayerBaseEffect(state);
+        if (playerBasesDict.ContainsKey(playerType))
+            playerBasesDict[playerType].ShowPlayerBaseEffect(state);
     }
 }