From 6fc4c3faec73f7edcf26192900a02dae454e5dc3 Mon Sep 17 00:00:00 2001
From: Guerra24 <lili@guerra24.net>
Date: Tue, 28 May 2024 16:41:41 -0600
Subject: [PATCH] Fix reward collision

---
 .../Editor/RewardAssetEditorWindow.cs            | 16 +++++++---------
 .../Runtime/RewardAsset.cs                       |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Packages/net.guerra24.avatarviewer.sdk/Editor/RewardAssetEditorWindow.cs b/Packages/net.guerra24.avatarviewer.sdk/Editor/RewardAssetEditorWindow.cs
index 6c42de0..00a4926 100644
--- a/Packages/net.guerra24.avatarviewer.sdk/Editor/RewardAssetEditorWindow.cs
+++ b/Packages/net.guerra24.avatarviewer.sdk/Editor/RewardAssetEditorWindow.cs
@@ -57,20 +57,18 @@ private void OnGUI()
                             if (!hasComponents)
                                 valid = false;
 
-                            if (rewardAsset.Info != rewardAssetInfo)
-                            {
-                                rewardAsset.Info = rewardAssetInfo;
-                                EditorUtility.SetDirty(rewardAsset);
-                                updatedAssets = true;
-                            }
-
                             UnityEditor.Editor.CreateEditor(rewardAssetInfo).OnInspectorGUI();
                             if (!hasRewardAsset)
                                 GUILayout.Label("Missing RewardAsset component");
                             if (!hasRigidBody)
                                 GUILayout.Label("Missing RigidBody component");
-                            if (hasComponents)
-                                GUILayout.Label("Reward valid");
+
+                            if (hasRewardAsset && rewardAsset.Info != rewardAssetInfo)
+                            {
+                                rewardAsset.Info = rewardAssetInfo;
+                                EditorUtility.SetDirty(rewardAsset);
+                                updatedAssets = true;
+                            }
                         }
                         else
                         {
diff --git a/Packages/net.guerra24.avatarviewer.sdk/Runtime/RewardAsset.cs b/Packages/net.guerra24.avatarviewer.sdk/Runtime/RewardAsset.cs
index 7422fd3..73f90c2 100644
--- a/Packages/net.guerra24.avatarviewer.sdk/Runtime/RewardAsset.cs
+++ b/Packages/net.guerra24.avatarviewer.sdk/Runtime/RewardAsset.cs
@@ -17,10 +17,9 @@ private void Start()
 
         private void OnCollisionEnter(Collision collision)
         {
-            if (Info.DisablePhysicsOnCollision)
+            if (Info.DisablePhysicsOnCollision && transform.parent == null)
             {
                 Rigidbody.isKinematic = true;
-                Rigidbody.detectCollisions = false;
                 transform.parent = collision.transform;
             }