Skip to content

Commit 841234a

Browse files
lowercasebtwFxMorin
andcommitted
Fix crash w/ lunar (#32)
Co-authored-by: Fx Morin <28154542+fxmorin@users.noreply.github.com>
1 parent 645f53e commit 841234a

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/main/java/btw/mixces/animatium/mixins/renderer/entity/MixinFishingHookRenderer.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
3535
import com.llamalad7.mixinextras.sugar.Local;
3636
import com.mojang.blaze3d.vertex.PoseStack;
37-
import net.minecraft.client.Minecraft;
3837
import net.minecraft.client.renderer.MultiBufferSource;
3938
import net.minecraft.client.renderer.entity.EntityRenderer;
4039
import net.minecraft.client.renderer.entity.EntityRendererProvider;
@@ -55,8 +54,6 @@
5554
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
5655
import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
5756

58-
import java.util.Objects;
59-
6057
@Mixin(FishingHookRenderer.class)
6158
public abstract class MixinFishingHookRenderer extends EntityRenderer<FishingHook, FishingHookRenderState> {
6259
protected MixinFishingHookRenderer(EntityRendererProvider.Context context) {
@@ -140,9 +137,10 @@ protected MixinFishingHookRenderer(EntityRendererProvider.Context context) {
140137
}
141138

142139
@ModifyArg(method = "extractRenderState(Lnet/minecraft/world/entity/projectile/FishingHook;Lnet/minecraft/client/renderer/entity/state/FishingHookRenderState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/FishingHookRenderer;getPlayerHandPos(Lnet/minecraft/world/entity/player/Player;FF)Lnet/minecraft/world/phys/Vec3;"), index = 1)
143-
private float animatium$fixCastLineSwing(float original) {
144-
if (AnimatiumConfig.instance().fixCastLineSwing) {
145-
return original * PlayerUtils.getHandMultiplier(Objects.requireNonNull(Minecraft.getInstance().player));
140+
private float animatium$fixCastLineSwing(float original, @Local(argsOnly = true) FishingHook fishingHook) {
141+
final Player player = fishingHook.getPlayerOwner();
142+
if (AnimatiumConfig.instance().fixCastLineSwing && player != null) {
143+
return original * PlayerUtils.getHandMultiplier(player);
146144
} else {
147145
return original;
148146
}

src/main/java/btw/mixces/animatium/mixins/renderer/entity/MixinLivingEntityRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public abstract class MixinLivingEntityRenderer<S extends LivingEntityRenderStat
7474
Entity entity = EntityUtils.getEntityByState(livingEntityRenderState);
7575
if (AnimatiumClient.isEnabled() && !AnimatiumConfig.instance().modelWhilstSleeping &&
7676
entity instanceof LivingEntity livingEntity &&
77-
livingEntity == Objects.requireNonNull(Minecraft.getInstance().player) &&
77+
livingEntity == Minecraft.getInstance().player &&
7878
livingEntityRenderState.hasPose(Pose.SLEEPING) &&
7979
livingEntity.isSleeping()) {
8080
ci.cancel();

0 commit comments

Comments
 (0)