From 70699662ebcbca661f454d33027cc119404247a0 Mon Sep 17 00:00:00 2001
From: Yeetusbleetus <49679841+Yeetusbleetus@users.noreply.github.com>
Date: Fri, 17 May 2024 18:20:12 +0300
Subject: [PATCH] Update CyanPlayerObjectAssigner.cs

Fix a error that would occur if another script tried to request the players pooled object before initialization
---
 .../UdonSharp/CyanPlayerObjectAssigner.cs                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/com.cyan.playerobjectpool/UdonSharp/CyanPlayerObjectAssigner.cs b/com.cyan.playerobjectpool/UdonSharp/CyanPlayerObjectAssigner.cs
index a2adbe6..10ccbc6 100644
--- a/com.cyan.playerobjectpool/UdonSharp/CyanPlayerObjectAssigner.cs
+++ b/com.cyan.playerobjectpool/UdonSharp/CyanPlayerObjectAssigner.cs
@@ -174,6 +174,11 @@ public GameObject _GetPlayerPooledObject(VRCPlayerApi player)
         [PublicAPI]
         public GameObject _GetPlayerPooledObjectById(int playerId)
         {
+            if (!_enabledAndInitialized)
+            {
+                return null;
+            }
+            
             int index = _objectPool._GetPlayerPoolIndexById(playerId);
 
             if (index == -1)
@@ -776,4 +781,4 @@ private void _LogError(string message)
 
         #endregion
     }
-}
\ No newline at end of file
+}