Update Pool.cs

Author: IntoTheDev

Pool.cs

@@ -1,5 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.InputSystem.Interactions;
 
 namespace ToolBox.Pools
 {
@@ -21,9 +22,6 @@ public Pool(Poolable prefab, int count)
 			Populate(count);
 		}
 
-		/// <summary>
-		/// Prefab must contain Poolable component
-		/// </summary>
 		public Pool(GameObject prefab, int count)
 		{
 			_prefab = prefab.GetComponent<Poolable>();
@@ -53,6 +51,9 @@ public static Pool Get(GameObject prefab)
 
 		public void Populate(int count)
 		{
+			if (count <= 0)
+				return;
+
 			for (int i = 0; i < count; i++)
 			{
 				Poolable entity = Object.Instantiate(_prefab);
@@ -66,15 +67,15 @@ public void Populate(int count)
 
 		public Poolable GetEntity()
 		{
-			Poolable entity = TakeEntity();
+			Poolable entity = GetEntityFromPool();
 			entity.ReturnFromPool();
 
 			return entity;
 		}
 
 		public Poolable GetEntity(Transform parent, bool spawnInWorldSpace)
 		{
-			Poolable entity = TakeEntity();
+			Poolable entity = GetEntityFromPool();
 
 			entity.transform.SetParent(parent, spawnInWorldSpace);
 			entity.ReturnFromPool();
@@ -84,7 +85,7 @@ public Poolable GetEntity(Transform parent, bool spawnInWorldSpace)
 
 		public Poolable GetEntity(Vector3 position, Quaternion rotation)
 		{
-			Poolable entity = TakeEntity();
+			Poolable entity = GetEntityFromPool();
 
 			entity.transform.SetPositionAndRotation(position, rotation);
 			entity.ReturnFromPool();
@@ -94,7 +95,7 @@ public Poolable GetEntity(Vector3 position, Quaternion rotation)
 
 		public Poolable GetEntity(Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace)
 		{
-			Poolable entity = TakeEntity();
+			Poolable entity = GetEntityFromPool();
 			Transform entityTransform = entity.transform;
 
 			entityTransform.SetParent(parent, spawnInWorldSpace);
@@ -128,14 +129,15 @@ public void ReturnEntity(Poolable entity)
 			entity.gameObject.SetActive(false);
 		}
 
-		private Poolable TakeEntity()
+		private Poolable GetEntityFromPool()
 		{
 			Poolable entity;
 
 			if (_currentCount == 0)
 			{
 				entity = Object.Instantiate(_prefab);
 				entity.SetPool(this);
+				entity.gameObject.SetActive(true);
 
 				return entity;
 			}