Revert "fix(sleep): actually revoke invuln on sleep state change (#374)"

John-Paul-R · John-Paul-R · commit 69319ceb89bf · 2026-04-06T01:11:17.000-04:00
This reverts commit 082a432.
diff --git a/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerData.java b/src/main/java/com/fibermc/essentialcommands/playerdata/PlayerData.java
@@ -399,17 +399,11 @@ public boolean isSleepingFromCommand() {
         return isSleepingFromCommand;
     }
 
-    public void setIsSleepingFromCommand(boolean isStartingSleeping) {
-        if (this.isSleepingFromCommand == isStartingSleeping) {
-            return;
-        }
-        if (isStartingSleeping) {
+    public void setIsSleepingFromCommand(boolean sleepingFromCommand) {
+        this.isSleepingFromCommand = sleepingFromCommand;
+        if (CONFIG.SLEEP_INVULN && sleepingFromCommand) {
             Pal.grantAbility(player, VanillaAbilities.INVULNERABLE, ECAbilitySources.SLEEP_INVULN);
-        } else {
-            // ending sleeping
-            Pal.revokeAbility(player, VanillaAbilities.INVULNERABLE, ECAbilitySources.SLEEP_INVULN);
         }
-        this.isSleepingFromCommand = isStartingSleeping;
     }
 
     public void setPreviousLocation(MinecraftLocation location) {

Original file line number	Diff line number	Diff line change
`@@ -399,17 +399,11 @@ public boolean isSleepingFromCommand() {`
`399`	`399`	`return isSleepingFromCommand;`
`400`	`400`	`}`
`401`	`401`
`402`		`- public void setIsSleepingFromCommand(boolean isStartingSleeping) {`
`403`		`- if (this.isSleepingFromCommand == isStartingSleeping) {`
`404`		`- return;`
`405`		`- }`
`406`		`- if (isStartingSleeping) {`
	`402`	`+ public void setIsSleepingFromCommand(boolean sleepingFromCommand) {`
	`403`	`+ this.isSleepingFromCommand = sleepingFromCommand;`
	`404`	`+ if (CONFIG.SLEEP_INVULN && sleepingFromCommand) {`
`407`	`405`	`Pal.grantAbility(player, VanillaAbilities.INVULNERABLE, ECAbilitySources.SLEEP_INVULN);`
`408`		`- } else {`
`409`		`- // ending sleeping`
`410`		`- Pal.revokeAbility(player, VanillaAbilities.INVULNERABLE, ECAbilitySources.SLEEP_INVULN);`
`411`	`406`	`}`
`412`		`- this.isSleepingFromCommand = isStartingSleeping;`
`413`	`407`	`}`
`414`	`408`
`415`	`409`	`public void setPreviousLocation(MinecraftLocation location) {`