Skip to content

Commit cc97ad9

Browse files
committed
Don't bother sending remove packet
1 parent fb2e2f1 commit cc97ad9

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernPlayerUtils.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.UUID;
23-
import net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
2423
import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
2524
import net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
2625
import net.minecraft.server.level.ServerPlayer;
@@ -144,19 +143,18 @@ public void refreshPlayer(@Nullable PacketEvent event, Player player, Player vie
144143
realProfile.properties().get("textures").forEach(p -> builder.put("textures", p));
145144
}
146145

147-
viewerNms.connection.send(new ClientboundPlayerInfoRemovePacket(List.of(player.getUniqueId())));
148146
nmsPlayer.gameProfile =
149147
new GameProfile(realProfile.id(), playerName, new PropertyMap(builder.build()));
150148
viewerNms.connection.send(
151149
ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(nmsPlayer), viewerNms));
152150
nmsPlayer.gameProfile = realProfile;
153151

154152
Scoreboard scoreboard = nmsPlayer.getBukkitEntity().getScoreboard().getHandle();
155-
PlayerTeam nmsTeam = scoreboard.getPlayersTeam(player.getName());
153+
PlayerTeam team = scoreboard.getPlayersTeam(player.getName());
156154

157-
if (nmsTeam != null) {
158-
ClientboundSetPlayerTeamPacket teamPacket = ClientboundSetPlayerTeamPacket.createPlayerPacket(
159-
nmsTeam, playerName, ClientboundSetPlayerTeamPacket.Action.ADD);
155+
if (team != null) {
156+
var teamPacket = ClientboundSetPlayerTeamPacket.createPlayerPacket(
157+
team, playerName, ClientboundSetPlayerTeamPacket.Action.ADD);
160158

161159
viewerNms.connection.send(teamPacket);
162160
}

0 commit comments

Comments
 (0)