fix held objects not dropping correctly

This commit is contained in:
NotAKidoS 2022-10-29 09:45:17 -05:00
parent 7f860f4fc2
commit 73762e7241
2 changed files with 5 additions and 3 deletions

View file

@ -15,6 +15,8 @@ internal class CVRPickupObject_Patch
[HarmonyPatch(typeof(CVRPickupObject), "Start")] [HarmonyPatch(typeof(CVRPickupObject), "Start")]
private static void CVRPickupObject_Start_Prefix(ref CVRPickupObject __instance) private static void CVRPickupObject_Start_Prefix(ref CVRPickupObject __instance)
{ {
if (__instance.gripOrigin == null) return;
Transform desktopOrigin = __instance.gripOrigin.Find("[Desktop]"); Transform desktopOrigin = __instance.gripOrigin.Find("[Desktop]");
if (desktopOrigin == null) return; if (desktopOrigin == null) return;
@ -44,7 +46,7 @@ public class CVRPickupObjectTracker : MonoBehaviour
if (pickupObject != null) 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]); (previousGripOrigin[pickupObject], pickupObject.gripOrigin) = (pickupObject.gripOrigin, previousGripOrigin[pickupObject]);
} }
} }

View file

@ -1,7 +1,7 @@
{ {
"_id": -1, "_id": -1,
"name": "DesktopVRSwitch", "name": "DesktopVRSwitch",
"modversion": "1.0.0", "modversion": "2.0.0",
"gameversion": "2022r168", "gameversion": "2022r168",
"loaderversion": "0.5.4", "loaderversion": "0.5.4",
"modtype": "Mod", "modtype": "Mod",
@ -16,7 +16,7 @@
"requirements": [ "requirements": [
"None" "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/", "sourcelink": "https://github.com/NotAKidOnSteam/DesktopVRSwitch/",
"changelog": "Initial Release", "changelog": "Initial Release",
"embedcolor": "3498db" "embedcolor": "3498db"