Skip to content

Commit 6369a83

Browse files
committed
Fix held items being incorrectly swapped
1 parent 751f844 commit 6369a83

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

common/src/main/java/org/vivecraft/client_vr/render/helpers/VRArmHelper.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,9 @@ public static void renderVRHand_Main(PoseStack poseStack, float partialTicks) {
143143
item = override;
144144
}
145145

146-
if (dataHolder.climbTracker.isClimbeyClimb() && item.getItem() != Items.SHEARS) {
146+
if (dataHolder.climbTracker.isClimbeyClimb()
147+
&& item.getItem() != Items.SHEARS
148+
&& dataHolder.climbTracker.isClaws(mc.player.getOffhandItem())) {
147149
item = override == null ? mc.player.getOffhandItem() : override;
148150
}
149151

@@ -207,7 +209,8 @@ public static void renderVRHand_Offhand(float partialTicks, boolean renderTelepo
207209
}
208210

209211
if (dataHolder.climbTracker.isClimbeyClimb()
210-
&& (item == null || item.getItem() != Items.SHEARS)) {
212+
&& item.getItem() != Items.SHEARS
213+
&& dataHolder.climbTracker.isClaws(mc.player.getMainHandItem())) {
211214
item = mc.player.getMainHandItem();
212215
}
213216

0 commit comments

Comments
 (0)