From 0b7b70d405a5c09c4dbe5e10256e4bc73d53315a Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:52:30 -0700 Subject: [PATCH] Fix PaperServerListPingEvent#getPlayerSample not being populated or used (#11387) --- .../Implement-extended-PaperServerListPingEvent.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/patches/server/Implement-extended-PaperServerListPingEvent.patch b/patches/server/Implement-extended-PaperServerListPingEvent.patch index a01c7051e..80b7f0fbe 100644 --- a/patches/server/Implement-extended-PaperServerListPingEvent.patch +++ b/patches/server/Implement-extended-PaperServerListPingEvent.patch @@ -66,6 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ +package com.destroystokyo.paper.network; + ++import com.destroystokyo.paper.profile.PlayerProfile; +import com.mojang.authlib.GameProfile; +import io.papermc.paper.adventure.AdventureComponent; +import java.util.ArrayList; @@ -79,6 +80,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +import net.minecraft.network.protocol.status.ServerStatus; +import net.minecraft.server.MinecraftServer; +import org.bukkit.craftbukkit.util.CraftIconCache; ++import org.jetbrains.annotations.NotNull; + +public final class StandardPaperServerListPingEventImpl extends PaperServerListPingEventImpl { + @@ -104,6 +106,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + return sample; + } + ++ @Override ++ public @NotNull List getPlayerSample() { ++ this.getListedPlayers(); // Populate the backing list for the transforming view, and null out originalSample (see getListedPlayers and processRequest) ++ return super.getPlayerSample(); ++ } ++ + private List getPlayerSampleHandle() { + if (this.originalSample != null) { + return this.originalSample;