13
0
geforkt von Mirrors/Paper

Fix PaperServerListPingEvent#getPlayerSample not being populated or used (#11387)

Dieser Commit ist enthalten in:
Jason Penilla 2024-09-10 10:52:30 -07:00
Ursprung d503cbe01f
Commit 0b7b70d405

Datei anzeigen

@ -66,6 +66,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+package com.destroystokyo.paper.network; +package com.destroystokyo.paper.network;
+ +
+import com.destroystokyo.paper.profile.PlayerProfile;
+import com.mojang.authlib.GameProfile; +import com.mojang.authlib.GameProfile;
+import io.papermc.paper.adventure.AdventureComponent; +import io.papermc.paper.adventure.AdventureComponent;
+import java.util.ArrayList; +import java.util.ArrayList;
@ -79,6 +80,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import net.minecraft.network.protocol.status.ServerStatus; +import net.minecraft.network.protocol.status.ServerStatus;
+import net.minecraft.server.MinecraftServer; +import net.minecraft.server.MinecraftServer;
+import org.bukkit.craftbukkit.util.CraftIconCache; +import org.bukkit.craftbukkit.util.CraftIconCache;
+import org.jetbrains.annotations.NotNull;
+ +
+public final class StandardPaperServerListPingEventImpl extends PaperServerListPingEventImpl { +public final class StandardPaperServerListPingEventImpl extends PaperServerListPingEventImpl {
+ +
@ -104,6 +106,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return sample; + return sample;
+ } + }
+ +
+ @Override
+ public @NotNull List<PlayerProfile> getPlayerSample() {
+ this.getListedPlayers(); // Populate the backing list for the transforming view, and null out originalSample (see getListedPlayers and processRequest)
+ return super.getPlayerSample();
+ }
+
+ private List<GameProfile> getPlayerSampleHandle() { + private List<GameProfile> getPlayerSampleHandle() {
+ if (this.originalSample != null) { + if (this.originalSample != null) {
+ return this.originalSample; + return this.originalSample;