diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java index 2ecc8c66..0ad3ebdb 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java @@ -966,8 +966,13 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt return CraftEventFactory.handleBlockFormEvent(instance, pPos, pNewState, 3, (Entity) (Object) this); } - @Redirect(method = "getDamageAfterArmorAbsorb", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;hurtArmor(Lnet/minecraft/world/damagesource/DamageSource;F)V")) - public void arclight$muteDamageArmor(LivingEntity entity, DamageSource damageSource, float damage) { + // https://github.com/IzzelAliz/Arclight/issues/831 + @Mixin(value = LivingEntity.class, priority = 1500) + public static class ObscureApiCompat { + + @Redirect(method = "getDamageAfterArmorAbsorb", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;hurtArmor(Lnet/minecraft/world/damagesource/DamageSource;F)V")) + private void arclight$muteDamageArmor(LivingEntity entity, DamageSource damageSource, float damage) { + } } @Redirect(method = "getDamageAfterMagicAbsorb", require = 0, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;hasEffect(Lnet/minecraft/world/effect/MobEffect;)Z")) diff --git a/arclight-common/src/main/resources/mixins.arclight.core.json b/arclight-common/src/main/resources/mixins.arclight.core.json index 3de8a495..549c156b 100644 --- a/arclight-common/src/main/resources/mixins.arclight.core.json +++ b/arclight-common/src/main/resources/mixins.arclight.core.json @@ -96,6 +96,7 @@ "world.entity.ItemBaseSteeringMixin", "world.entity.LightningBoltMixin", "world.entity.LivingEntityMixin", + "world.entity.LivingEntityMixin$ObscureApiCompat", "world.entity.MobMixin", "world.entity.PathfinderMobMixin", "world.entity.ai.behavior.AssignProfessionFromJobSiteMixin",