From ae102817b6f41e02ba19e100834b9c8ab770d344 Mon Sep 17 00:00:00 2001 From: John Etherfield Date: Sun, 4 Oct 2026 19:28:30 +0200 Subject: [PATCH] fix: revert spectator tab highlight mixin to restore vanilla spectator gameplay --- .../examp/john/mixin/SpectatorTabMixin.java | 24 ------------------- src/main/resources/msnexus.mixins.json | 3 +-- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/main/java/org/examp/john/mixin/SpectatorTabMixin.java diff --git a/src/main/java/org/examp/john/mixin/SpectatorTabMixin.java b/src/main/java/org/examp/john/mixin/SpectatorTabMixin.java deleted file mode 100644 index 2d52508..0000000 --- a/src/main/java/org/examp/john/mixin/SpectatorTabMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.examp.john.mixin; - -import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.level.GameType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ClientboundPlayerInfoUpdatePacket.Entry.class) -public class SpectatorTabMixin { - - @Redirect( - method = "(Lnet/minecraft/server/level/ServerPlayer;)V", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/server/level/ServerPlayer;gameMode()Lnet/minecraft/world/level/GameType;" - ) - ) - private static GameType msnexus$highlightSpectatorsInTab(ServerPlayer player) { - GameType gameMode = player.gameMode(); - return gameMode == GameType.SPECTATOR ? GameType.SURVIVAL : gameMode; - } -} diff --git a/src/main/resources/msnexus.mixins.json b/src/main/resources/msnexus.mixins.json index fb727b4..8a660c1 100644 --- a/src/main/resources/msnexus.mixins.json +++ b/src/main/resources/msnexus.mixins.json @@ -4,8 +4,7 @@ "package": "org.examp.john.mixin", "compatibilityLevel": "JAVA_25", "mixins": [ - "CommandLogMixin", - "SpectatorTabMixin" + "CommandLogMixin" ], "injectors": { "defaultRequire": 1