From 33c0cc6979ef21ab247d2e9337f86a860563b1f0 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 25 Apr 2021 00:50:06 -0300 Subject: [PATCH] damage can also be reported if its == 0. Might be useful --- .../java/carpet/mixins/LivingEntity_scarpetEventsMixin.java | 2 +- .../java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e997f533..9ac76586 100644 --- a/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java +++ b/src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java @@ -29,7 +29,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) {