Fix Bag When VR Switching

hammy275 · Jul 9, 2023 · e915a40 · e915a40
1 parent 9334af6
commit e915a40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/common/src/main/java/com/hammy275/immersivemc/client/subscribe/ClientLogicSubscriber.java b/common/src/main/java/com/hammy275/immersivemc/client/subscribe/ClientLogicSubscriber.java
@@ -177,6 +177,10 @@ public static void onDisconnect(Player player) {
     }
 
     protected static <I extends AbstractImmersiveInfo> void tickInfos(AbstractImmersive<I> singleton, Player player) {
+        // Don't tick if VR only and not in VR
+        if (singleton.isVROnly() && !VRPluginVerify.clientInVR()) {
+            return;
+        }
         singleton.globalTick();
         if (singleton.getTrackedObjects().size() == 0) {
             singleton.noInfosTick(); // Run onNoInfos() function if we don't have any infos right now

diff --git a/common/src/main/java/com/hammy275/immersivemc/client/subscribe/ClientRenderSubscriber.java b/common/src/main/java/com/hammy275/immersivemc/client/subscribe/ClientRenderSubscriber.java
@@ -42,6 +42,9 @@ public static void onWorldRender(PoseStack stack) {
     protected static <I extends AbstractImmersiveInfo> void renderInfos(AbstractImmersive<I> singleton,
                                                                  PoseStack stack) {
         try {
+            if (singleton.isVROnly() && !VRPluginVerify.clientInVR()) {
+                return;
+            }
             for (I info : singleton.getTrackedObjects()) {
                 singleton.doRender(info, stack, VRPluginVerify.clientInVR());
             }