Fix premium player being invulnerable after using /logout command

NikitaCartes · May 20, 2024 · 1c86e62 · 1c86e62
1 parent 6d5de20
commit 1c86e62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 3.0.25
+##### Minecraft 1.20.5-1.20.6
+
+1) Fix premium player being invulnerable after using `/logout` command
+
 ### 3.0.24
 ##### Minecraft 1.20.5-1.20.6
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Mod
 mod_name=EasyAuth
 mod_id=easyauth
-mod_version=3.0.24
+mod_version=3.0.25
 
 # Fabric
 minecraft_version=1.20.6

diff --git a/src/main/java/xyz/nikitacartes/easyauth/commands/LogoutCommand.java b/src/main/java/xyz/nikitacartes/easyauth/commands/LogoutCommand.java
@@ -23,7 +23,7 @@ public static void registerCommand(CommandDispatcher<ServerCommandSource> dispat
     private static int logout(ServerCommandSource serverCommandSource) throws CommandSyntaxException {
         ServerPlayerEntity player = serverCommandSource.getPlayerOrThrow();
 
-        if (((PlayerAuth) player).easyAuth$isAuthenticated()) {
+        if (((PlayerAuth) player).easyAuth$isAuthenticated() && !((PlayerAuth) player).easyAuth$canSkipAuth()) {
             // player.getServer().getPlayerManager().sendToAll(new PlayerListS2CPacket(PlayerListS2CPacket.Action.REMOVE_PLAYER, player));
             ((PlayerAuth) player).easyAuth$setAuthenticated(false);
             ((PlayerAuth) player).easyAuth$saveLastLocation(true);