diff --git a/src/main/java/io/github/friedkeenan/chronopyre/mixin/AddRestingToPlayer.java b/src/main/java/io/github/friedkeenan/chronopyre/mixin/AddRestingToPlayer.java index 7ff2f55..25a3bb2 100644 --- a/src/main/java/io/github/friedkeenan/chronopyre/mixin/AddRestingToPlayer.java +++ b/src/main/java/io/github/friedkeenan/chronopyre/mixin/AddRestingToPlayer.java @@ -16,7 +16,6 @@ import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; @@ -103,13 +102,6 @@ private void validateResting(CallbackInfo info) { } } - @Inject(at = @At("TAIL"), method = "actuallyHurt") - private void makeDamageStopResting(DamageSource source, float damage, CallbackInfo info) { - if (this.isResting()) { - this.stopResting(true); - } - } - @WrapOperation( at = @At( value = "INVOKE", diff --git a/src/main/java/io/github/friedkeenan/chronopyre/mixin/SpecializeRestingForLocalPlayer.java b/src/main/java/io/github/friedkeenan/chronopyre/mixin/SpecializeRestingForLocalPlayer.java deleted file mode 100644 index f1717f4..0000000 --- a/src/main/java/io/github/friedkeenan/chronopyre/mixin/SpecializeRestingForLocalPlayer.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.github.friedkeenan.chronopyre.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.client.player.LocalPlayer; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.level.Level; - -@Mixin(LocalPlayer.class) -public abstract class SpecializeRestingForLocalPlayer extends AddRestingToPlayer { - protected SpecializeRestingForLocalPlayer(EntityType entityType, Level level) { - super(entityType, level); - } - - @Inject(at = @At("TAIL"), method = "actuallyHurt") - private void makeDamageStopResting(DamageSource source, float damage, CallbackInfo info) { - if (this.isResting()) { - this.stopResting(true); - } - } -} diff --git a/src/main/resources/chronopyre.mixins.json b/src/main/resources/chronopyre.mixins.json index 04ca0ea..c9ef917 100644 --- a/src/main/resources/chronopyre.mixins.json +++ b/src/main/resources/chronopyre.mixins.json @@ -7,7 +7,6 @@ "mixins": [ "AddRestingToPlayer", "SpecializeRestingForServerPlayer", - "SpecializeRestingForLocalPlayer", "HijackStopSleepPacket", "SpeedTimeUpWhenResting", "RestAtCampfire",