icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-04-25 00:50:22 -03:00
2 parents 31afc28401 33c0cc6979
commit e8ab5f0d50
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/LivingEntity_scarpetEventsMixin.java
+1 -1
View File
@@ -39,7 +39,7 @@ public abstract class LivingEntity_scarpetEventsMixin extends Entity implements
@Inject(method = "applyDamage", locals = LocalCapture.CAPTURE_FAILHARD, at = @At( @Inject(method = "applyDamage", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(
value = "INVOKE", 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 shift = At.Shift.BEFORE
)) ))
private void entityTakingDamage(DamageSource source, float amount, CallbackInfo ci) private void entityTakingDamage(DamageSource source, float amount, CallbackInfo ci)
src/main/java/carpet/mixins/PlayerEntity_scarpetEventsMixin.java
+1 -1
View File
@@ -34,7 +34,7 @@ public abstract class PlayerEntity_scarpetEventsMixin extends LivingEntity
@Inject(method = "applyDamage", locals = LocalCapture.CAPTURE_FAILHARD, at = @At( @Inject(method = "applyDamage", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(
value = "INVOKE", 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) private void playerTakingDamage(DamageSource source, float amount, CallbackInfo ci)
{ {