From 73762e7241a122a88c1262c9078724ab2254a9e2 Mon Sep 17 00:00:00 2001
From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com>
Date: Sat, 29 Oct 2022 09:45:17 -0500
Subject: [PATCH] fix held objects not dropping correctly

---
 DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs | 4 +++-
 DesktopVRSwitch/format.json                       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs b/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs
index 36cac6d..5bb7943 100644
--- a/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs
+++ b/DesktopVRSwitch/Patches/CVRPickupObjectTracker.cs
@@ -15,6 +15,8 @@ internal class CVRPickupObject_Patch
     [HarmonyPatch(typeof(CVRPickupObject), "Start")]
     private static void CVRPickupObject_Start_Prefix(ref CVRPickupObject __instance)
     {
+        if (__instance.gripOrigin == null) return;
+
         Transform desktopOrigin = __instance.gripOrigin.Find("[Desktop]");
         if (desktopOrigin == null) return;
 
@@ -44,7 +46,7 @@ public class CVRPickupObjectTracker : MonoBehaviour
 
         if (pickupObject != null)
         {
-            if (pickupObject.IsGrabbedByMe()) pickupObject.Drop();
+            if (pickupObject.IsGrabbedByMe() && pickupObject._controllerRay != null) pickupObject._controllerRay.DropObject(true);
             (previousGripOrigin[pickupObject], pickupObject.gripOrigin) = (pickupObject.gripOrigin, previousGripOrigin[pickupObject]);
         }
     }
diff --git a/DesktopVRSwitch/format.json b/DesktopVRSwitch/format.json
index 258d342..6f77ed3 100644
--- a/DesktopVRSwitch/format.json
+++ b/DesktopVRSwitch/format.json
@@ -1,7 +1,7 @@
 {
   "_id": -1,
   "name": "DesktopVRSwitch",
-  "modversion": "1.0.0",
+  "modversion": "2.0.0",
   "gameversion": "2022r168",
   "loaderversion": "0.5.4",
   "modtype": "Mod",
@@ -16,7 +16,7 @@
   "requirements": [
     "None"
   ],
-  "downloadlink": "https://github.com/NotAKidOnSteam/DesktopVRSwitch/releases/download/r1/DesktopVRSwitch.dll",
+  "downloadlink": "https://github.com/NotAKidOnSteam/DesktopVRSwitch/releases/download/r2/DesktopVRSwitch.dll",
   "sourcelink": "https://github.com/NotAKidOnSteam/DesktopVRSwitch/",
   "changelog": "Initial Release",
   "embedcolor": "3498db"