Update ObjectPooler.cs

ertanturan · Mar 29, 2020 · d6349aa · d6349aa
1 parent db90e58
commit d6349aa
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/Assets/CustomTools/ObjectPooling/Scripts/ObjectPool/ObjectPooler.cs b/Assets/CustomTools/ObjectPooling/Scripts/ObjectPool/ObjectPooler.cs
@@ -92,11 +92,19 @@ public GameObject SpawnFromPool(PooledObjectType tag, Vector3 pos, Quaternion ro
     public void Despawn(GameObject obj)
     {
         PooledObjectType tag = obj.GetComponent<IPooledObject>().PoolType;
-        PoolDictionary[tag].Enqueue(obj);
 
-        IPooledObject iPooledObj = obj.GetComponent<IPooledObject>();
-        if (iPooledObj != null) iPooledObj.OnObjectDespawn();
-        obj.SetActive(false);
+        if (tag != null)
+        {
+            PoolDictionary[tag].Enqueue(obj);
+
+            IPooledObject iPooledObj = obj.GetComponent<IPooledObject>();
+            if (iPooledObj != null) iPooledObj.OnObjectDespawn();
+            obj.SetActive(false);
+        }
+        else
+        {
+            Debug.LogWarning("Trying to despawn object which is not pooled !");
+        }
 
     }