Update safety in spawn position

Author: omundy

Assets/_Project/Scripts/Players/PlayerManager.cs

@@ -240,8 +240,8 @@ public void PlayEvent (FeedData feed)
      */
     Vector3 GetClearSpawnPosition ()
     {
-        Vector3 spawnPosition = new Vector3 ();
-        float startTime = Time.realtimeSinceStartup;
+        Vector3 spawnPosition = Vector3.zero;
+        int safety = 0;
         bool positionClear = false;
         int layerMask = (1 << 8); // only Layer 8 "Players"
         //Debug.Log ("PlayerManager.GetClearSpawnPosition() bounds = " + worldContainerCollider.bounds.ToString ());
@@ -254,12 +254,13 @@ Vector3 GetClearSpawnPosition ()
             Collider [] hitColliders = Physics.OverlapSphere (spawnPosition, 0.75f, layerMask);
             // if collider isn't touching another player collider then set true to stop loop
             if (hitColliders.Length <= 0) positionClear = true;
-            // else continue until time has run out
-            if (Time.realtimeSinceStartup - startTime > 0.5f) {
-                Debug.Log ("Time out placing GameObject!");
-                return Vector3.zero;
+            // safety
+            if (++safety > 10) {
+                Debug.Log ("PlayerManager.GetClearSpawnPosition() - Safety first!");
+                return spawnPosition;
             }
         }
+        //Debug.Log ("PlayerManager.GetClearSpawnPosition() spawnPosition = " + spawnPosition.ToString ());
         return spawnPosition;
     }
 
@@ -286,7 +287,7 @@ public static Vector3 RandomPointInBounds (Bounds bounds)
     /// <param name="destroyDelay">Destroy delay</param>
     void AttachDetachAnimation (GameObject prefab, bool randomPosition, float scaleMultiplier, float destroyDelay = -1f)
     {
-        Debug.Log ("AttachDetachAnimation() prefab.name = " + prefab.name);
+        //Debug.Log ("AttachDetachAnimation() prefab.name = " + prefab.name);
 
 
         // ATTACH THE GAME OBJECT WITH ANIMATION
@@ -337,7 +338,7 @@ IEnumerator ResetEffectPlayingState (float wait)
 
     IEnumerator PlayBattleEffects (FeedData feed)
     {
-        Debug.Log ("PlayBattle() feed = " + feed.ToString ());
+        //Debug.Log ("PlayBattle() feed = " + feed.ToString ());
 
 
         // start battle