Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixin conflict with thirst (#605)

Browse Source
This commit is contained in:
IzzelAliz 2022-06-20 20:42:04 +08:00
parent e7caf6baa0
commit 97878099f2
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java
View File

@ -79,6 +79,7 @@ import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@ -439,8 +440,8 @@ public abstract class PlayerMixin extends LivingEntityMixin implements PlayerEnt
} }
} }
@Redirect(method = "jumpFromGround", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;causeFoodExhaustion(F)V")) @ModifyArg(method = "jumpFromGround", index = 0, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;causeFoodExhaustion(F)V"))
private void arclight$exhaustInfo(net.minecraft.world.entity.player.Player player, float f) { private float arclight$exhaustInfo(float f) {
SpigotWorldConfig config = ((WorldBridge) level).bridge$spigotConfig(); SpigotWorldConfig config = ((WorldBridge) level).bridge$spigotConfig();
if (config != null) { if (config != null) {
if (this.isSprinting()) { if (this.isSprinting()) {
@ -451,7 +452,7 @@ public abstract class PlayerMixin extends LivingEntityMixin implements PlayerEnt
bridge$pushExhaustReason(EntityExhaustionEvent.ExhaustionReason.JUMP); bridge$pushExhaustReason(EntityExhaustionEvent.ExhaustionReason.JUMP);
} }
} }
this.causeFoodExhaustion(f); return f;
} }
@Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;setSharedFlag(IZ)V")) @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;setSharedFlag(IZ)V"))