Fix held items being incorrectly swapped

Vivecraft · Nov 11, 2023 · 6369a83 · 6369a83
1 parent 751f844
commit 6369a83
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRArmHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRArmHelper.java
@@ -143,7 +143,9 @@ public static void renderVRHand_Main(PoseStack poseStack, float partialTicks) {
             item = override;
         }
 
-        if (dataHolder.climbTracker.isClimbeyClimb() && item.getItem() != Items.SHEARS) {
+        if (dataHolder.climbTracker.isClimbeyClimb()
+            && item.getItem() != Items.SHEARS
+            && dataHolder.climbTracker.isClaws(mc.player.getOffhandItem())) {
             item = override == null ? mc.player.getOffhandItem() : override;
         }
 
@@ -207,7 +209,8 @@ public static void renderVRHand_Offhand(float partialTicks, boolean renderTelepo
         }
 
         if (dataHolder.climbTracker.isClimbeyClimb()
-            && (item == null || item.getItem() != Items.SHEARS)) {
+            && item.getItem() != Items.SHEARS
+            && dataHolder.climbTracker.isClaws(mc.player.getMainHandItem())) {
             item = mc.player.getMainHandItem();
         }