fix: Rewards default position and enabled checks

MirrorNetworking · Dec 21, 2024 · ecc3c6e · ecc3c6e
1 parent 726d49d
commit ecc3c6e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Reward.cs b/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Reward.cs
@@ -15,7 +15,16 @@ public class Reward : NetworkBehaviour
 
         protected override void OnValidate()
         {
+            if (Application.isPlaying) return;
+
             base.OnValidate();
+            Reset();
+        }
+
+        void Reset()
+        {
+            // Default position out of reach
+            transform.position = new Vector3(0, -1000, 0);
 
             if (randomColor == null)
                 randomColor = GetComponent<Common.RandomColor>();
@@ -29,6 +38,9 @@ public override void OnStartServer()
         [ServerCallback]
         void OnTriggerEnter(Collider other)
         {
+            // Don't process collisions when it's in the pool
+            if (!gameObject.activeSelf) return;
+
             // Set up physics layers to prevent this from being called by non-players
             // and eliminate the need for a tag check here.
             if (!other.CompareTag("Player")) return;

diff --git a/Assets/Mirror/Examples/Room/Scripts/Reward.cs b/Assets/Mirror/Examples/Room/Scripts/Reward.cs
@@ -15,7 +15,16 @@ public class Reward : NetworkBehaviour
 
         protected override void OnValidate()
         {
+            if (Application.isPlaying) return;
+
             base.OnValidate();
+            Reset();
+        }
+
+        void Reset()
+        {
+            // Default position out of reach
+            transform.position = new Vector3(0, -1000, 0);
 
             if (randomColor == null)
                 randomColor = GetComponent<Common.RandomColor>();
@@ -29,6 +38,9 @@ public override void OnStartServer()
         [ServerCallback]
         void OnTriggerEnter(Collider other)
         {
+            // Don't process collisions when it's in the pool
+            if (!gameObject.activeSelf) return;
+
             // Set up physics layers to prevent this from being called by non-players
             // and eliminate the need for a tag check here.
             if (!other.CompareTag("Player")) return;