DivineMC/divinemc-server/minecraft-patches/features/0065-Do-not-send-spectator-change-packet.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Sun, 20 Jul 2025 00:09:31 +0300
Subject: [PATCH] Do not send spectator change packet


diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
index 02c02314a4a6a7a6da427f0d064dbc61ce92301d..56efd53d22f6d7338ef7d7cc36d612d410018c89 100644
--- a/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -75,10 +75,7 @@ public class ServerPlayerGameMode {
             // CraftBukkit end
             this.setGameModeForPlayer(gameModeForPlayer, this.gameModeForPlayer); // Paper - Fix MC-259571
             this.player.onUpdateAbilities();
-            this.level
-                .getServer()
-                .getPlayerList()
-                .broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
+            this.sendGameModeUpdatePacket(gameModeForPlayer); // DivineMC - Do not send spectator change packet
             this.level.updateSleepingPlayerList();
             if (gameModeForPlayer == GameType.CREATIVE) {
                 this.player.resetCurrentImpulseContext();
@@ -571,4 +568,17 @@ public class ServerPlayerGameMode {
         return false;
     }
     // Purpur end - Shift right click to use exp for mending
+
+    // DivineMC start - Do not send spectator change packet
+    private void sendGameModeUpdatePacket(GameType newGameMode) {
+        ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(
+            ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player);
+
+        if (org.bxteam.divinemc.config.DivineConfig.NetworkCategory.sendSpectatorChangePacket || newGameMode != GameType.SPECTATOR) {
+            this.level.getServer().getPlayerList().broadcastAll(packet, this.player);
+        } else {
+            this.player.connection.send(packet);
+        }
+    }
+    // DivineMC end - Do not send spectator change packet
 }
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 0888ba7853f07909e9915d35f706d39a1c6cf307..48a02a25c4fa6f3bacefaccd122694156da1a331 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -356,6 +356,8 @@ public abstract class PlayerList {
             // CraftBukkit start - sendAll above replaced with this loop
             ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player
 
+            ClientboundPlayerInfoUpdatePacket modifiedPacket = this.createSpectatorFilteredPacket(packet); // DivineMC - Do not send spectator change packet
+
             final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join
             for (int i = 0; i < this.players.size(); ++i) {
                 ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
@@ -364,7 +366,7 @@ public abstract class PlayerList {
                     // Paper start - Add Listing API for Player
                     if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
                         // Paper end - Add Listing API for Player
-                        entityplayer1.connection.send(packet);
+                        this.sendPlayerInfoPacket(entityplayer1, player, packet, modifiedPacket); // DivineMC - Do not send spectator change packet
                         // Paper start - Add Listing API for Player
                     } else {
                         entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
@@ -380,7 +382,10 @@ public abstract class PlayerList {
             }
             // Paper start - Use single player info update packet on join
             if (!onlinePlayers.isEmpty()) {
-                player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player)); // Paper - Add Listing API for Player
+                // DivineMC start - Do not send spectator change packet
+                ClientboundPlayerInfoUpdatePacket updatePacket = this.createFilteredPlayerListPacket(onlinePlayers, player);
+                player.connection.send(updatePacket); // Paper - Add Listing API for Player
+                // DivineMC end - Do not send spectator change packet
             }
             // Paper end - Use single player info update packet on join
             player.sentListPacket = true;
@@ -1468,4 +1473,69 @@ public abstract class PlayerList {
     public boolean isAllowCommandsForAllPlayers() {
         return this.allowCommandsForAllPlayers;
     }
+
+    // DivineMC start - Do not send spectator change packet
+    @Nullable
+    private ClientboundPlayerInfoUpdatePacket createSpectatorFilteredPacket(ClientboundPlayerInfoUpdatePacket originalPacket) {
+        if (org.bxteam.divinemc.config.DivineConfig.NetworkCategory.sendSpectatorChangePacket) {
+            return null;
+        }
+
+        ClientboundPlayerInfoUpdatePacket.Entry entry = originalPacket.entries().getFirst();
+        if (entry.gameMode() != net.minecraft.world.level.GameType.SPECTATOR) {
+            return null;
+        }
+
+        ClientboundPlayerInfoUpdatePacket.Entry filteredEntry = new ClientboundPlayerInfoUpdatePacket.Entry(
+            entry.profileId(),
+            entry.profile(),
+            entry.listed(),
+            entry.latency(),
+            net.minecraft.world.level.GameType.SURVIVAL,
+            entry.displayName(),
+            entry.showHat(),
+            entry.listOrder(),
+            entry.chatSession());
+
+        return new ClientboundPlayerInfoUpdatePacket(originalPacket.actions(), List.of(filteredEntry));
+    }
+
+    private void sendPlayerInfoPacket(ServerPlayer receiver, ServerPlayer joiningPlayer,
+                                    ClientboundPlayerInfoUpdatePacket originalPacket,
+                                    @Nullable ClientboundPlayerInfoUpdatePacket filteredPacket) {
+        if (org.bxteam.divinemc.config.DivineConfig.NetworkCategory.sendSpectatorChangePacket ||
+            receiver == joiningPlayer ||
+            filteredPacket == null) {
+            receiver.connection.send(originalPacket);
+        } else {
+            receiver.connection.send(filteredPacket);
+        }
+    }
+
+    private ClientboundPlayerInfoUpdatePacket createFilteredPlayerListPacket(List<ServerPlayer> onlinePlayers, ServerPlayer joiningPlayer) {
+        ClientboundPlayerInfoUpdatePacket updatePacket = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, joiningPlayer);
+
+        if (org.bxteam.divinemc.config.DivineConfig.NetworkCategory.sendSpectatorChangePacket) {
+            return updatePacket;
+        }
+
+        List<ClientboundPlayerInfoUpdatePacket.Entry> newEntries = new java.util.ArrayList<>();
+        for (ClientboundPlayerInfoUpdatePacket.Entry entry : updatePacket.entries()) {
+            ClientboundPlayerInfoUpdatePacket.Entry newEntry = new ClientboundPlayerInfoUpdatePacket.Entry(
+                entry.profileId(),
+                entry.profile(),
+                entry.listed(),
+                entry.latency(),
+                entry.gameMode() == net.minecraft.world.level.GameType.SPECTATOR ?
+                    net.minecraft.world.level.GameType.SURVIVAL : entry.gameMode(),
+                entry.displayName(),
+                entry.showHat(),
+                entry.listOrder(),
+                entry.chatSession());
+            newEntries.add(newEntry);
+        }
+
+        return new ClientboundPlayerInfoUpdatePacket(updatePacket.actions(), newEntries);
+    }
+    // DivineMC end - Do not send spectator change packet
 }