[1.18.x] Fix 2 crossbow animations not applying to custom variants (#8625)

This commit is contained in:
Autovw authored and GitHub committed 2022-06-05 16:34:02 +01:00
1 parent 8e7b08b96d
commit cceb8db74e
2 files changed
+18

No files matched your search

@@ -15,6 +15,15 @@
this.m_109371_(p_109318_, p_109315_, f1, InteractionHand.OFF_HAND, f6, this.f_109301_, f7, p_109316_, p_109317_, p_109319_);
}
@@ -342,7 +_,7 @@
} else {
this.m_109353_(p_109379_, p_109380_, p_109381_, p_109378_, humanoidarm, p_109376_, p_109377_);
}
- } else if (p_109377_.m_150930_(Items.f_42717_)) {
+ } else if (p_109377_.m_41720_() instanceof CrossbowItem) {
boolean flag1 = CrossbowItem.m_40932_(p_109377_);
boolean flag2 = humanoidarm == HumanoidArm.RIGHT;
int i = flag2 ? 1 : -1;
@@ -487,8 +_,16 @@
this.f_109304_ = Mth.m_14036_(this.f_109304_ - 0.4F, 0.0F, 1.0F);
} else {
@@ -10,6 +10,15 @@
}
public Vec3 m_7860_(AbstractClientPlayer p_117785_, float p_117786_) {
@@ -123,7 +_,7 @@
if (useanim == UseAnim.SPYGLASS) {
return HumanoidModel.ArmPose.SPYGLASS;
}
- } else if (!p_117795_.f_20911_ && itemstack.m_150930_(Items.f_42717_) && CrossbowItem.m_40932_(itemstack)) {
+ } else if (!p_117795_.f_20911_ && itemstack.m_41720_() instanceof CrossbowItem && CrossbowItem.m_40932_(itemstack)) {
return HumanoidModel.ArmPose.CROSSBOW_HOLD;
}
@@ -158,10 +_,12 @@
}