Revert canceling rest when player is damaged

friedkeenan · Oct 23, 2023 · 5cf08d0 · 5cf08d0
1 parent 989b8e7
commit 5cf08d0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 35 deletions.
diff --git 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
diff --git 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",