Prevent multiple ragdolls being spawned on death (#29)

peterimprobable · mattyoung-improbable · commit cb49e3350d41 · 2018-10-10T14:52:10.000+01:00
* Keep a local boolean flag to prevent multiple ragdolls being spawned between respawns
diff --git a/workers/unity/Packages/com.improbable.gdk.ragdolls/Behaviours/RagdollSpawner.cs b/workers/unity/Packages/com.improbable.gdk.ragdolls/Behaviours/RagdollSpawner.cs
@@ -17,23 +17,26 @@ public class RagdollSpawner : MonoBehaviour
         public RagdollSpawned OnRagdollSpawned;
 
         private ObjectPool<PoolableRagdoll> pool;
+        private bool hasRagdollSpawned;
 
         private void OnEnable()
         {
             health.OnHealthModified += OnHealthModified;
+            health.OnRespawn += (empty) => hasRagdollSpawned = false;
             pool = ObjectPooler.GetOrCreateObjectPool<PoolableRagdoll>(ragdollPrefab, 2);
         }
 
         private void OnHealthModified(HealthModifiedInfo info)
         {
-            if (info.Died)
+            if (info.Died && !hasRagdollSpawned)
             {
                 OnDeath(info.Modifier);
             }
         }
 
         private void OnDeath(HealthModifier deathDetails)
         {
+            hasRagdollSpawned = true;
             var ragdoll = pool.Get();
             if (transformToMatch != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -17,23 +17,26 @@ public class RagdollSpawner : MonoBehaviour`
`17`	`17`	`public RagdollSpawned OnRagdollSpawned;`
`18`	`18`
`19`	`19`	`private ObjectPool<PoolableRagdoll> pool;`
	`20`	`+ private bool hasRagdollSpawned;`
`20`	`21`
`21`	`22`	`private void OnEnable()`
`22`	`23`	`{`
`23`	`24`	`health.OnHealthModified += OnHealthModified;`
	`25`	`+ health.OnRespawn += (empty) => hasRagdollSpawned = false;`
`24`	`26`	`pool = ObjectPooler.GetOrCreateObjectPool<PoolableRagdoll>(ragdollPrefab, 2);`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`private void OnHealthModified(HealthModifiedInfo info)`
`28`	`30`	`{`
`29`		`- if (info.Died)`
	`31`	`+ if (info.Died && !hasRagdollSpawned)`
`30`	`32`	`{`
`31`	`33`	`OnDeath(info.Modifier);`
`32`	`34`	`}`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`private void OnDeath(HealthModifier deathDetails)`
`36`	`38`	`{`
	`39`	`+ hasRagdollSpawned = true;`
`37`	`40`	`var ragdoll = pool.Get();`
`38`	`41`	`if (transformToMatch != null)`
`39`	`42`	`{`