From 825023f82ee53d3d7a820cacb8d543071ff36553 Mon Sep 17 00:00:00 2001
From: modmuss <modmuss50@gmail.com>
Date: Fri, 8 Nov 2024 13:53:09 +0000
Subject: [PATCH] Fix crash when none player entities are flying with an
elytra. (#4218)
Fixes #4217
---
.../fabric/mixin/entity/event/elytra/LivingEntityMixin.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java
index 9b0ad57ef..dc58c110c 100644
--- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java
+++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/elytra/LivingEntityMixin.java
@@ -25,7 +25,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.world.World;
import net.fabricmc.fabric.api.entity.event.v1.EntityElytraEvents;
@@ -64,7 +63,7 @@ abstract class LivingEntityMixin extends Entity {
@SuppressWarnings("ConstantConditions")
@Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/entity/EquipmentSlot;VALUES:Ljava/util/List;"), method = "canGlide", allow = 1, cancellable = true)
void injectElytraCheck(CallbackInfoReturnable<Boolean> cir) {
- PlayerEntity self = (PlayerEntity) (Object) this;
+ LivingEntity self = (LivingEntity) (Object) this;
if (!EntityElytraEvents.ALLOW.invoker().allowElytraFlight(self)) {
cir.setReturnValue(false);