diff --git a/src/main/java/carpet/mixins/LivingEntity_scarpetEventsMixin.java b/src/main/java/carpet/mixins/LivingEntity_scarpetEventsMixin.java index 24ddb8b9..74822fd4 100644 --- a/src/main/java/carpet/mixins/LivingEntity_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/LivingEntity_scarpetEventsMixin.java @@ -39,7 +39,7 @@ public abstract class LivingEntity_scarpetEventsMixin extends Entity implements @Inject(method = "applyDamage", locals = LocalCapture.CAPTURE_FAILHARD, at = @At( value = "INVOKE", - target = "Lnet/minecraft/entity/LivingEntity;getHealth()F", + target = "Lnet/minecraft/entity/LivingEntity;applyArmorToDamage(Lnet/minecraft/entity/damage/DamageSource;F)F", shift = At.Shift.BEFORE )) private void entityTakingDamage(DamageSource source, float amount, CallbackInfo ci) diff --git a/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java b/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java index 3f98fb79..999105bb 100644 --- a/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java @@ -34,7 +34,7 @@ public abstract class PlayerEntity_scarpetEventsMixin extends LivingEntity @Inject(method = "applyDamage", locals = LocalCapture.CAPTURE_FAILHARD, at = @At( value = "INVOKE", - target = "Lnet/minecraft/entity/player/PlayerEntity;addExhaustion(F)V" + target = "Lnet/minecraft/entity/player/PlayerEntity;applyArmorToDamage(Lnet/minecraft/entity/damage/DamageSource;F)F" )) private void playerTakingDamage(DamageSource source, float amount, CallbackInfo ci) {