From d35e326f5e55fa14cdf9b1eacba970704ddcc16e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 27 Nov 2017 16:21:19 +0100 Subject: [PATCH] Implement deprecated player sample API diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java index dd1deafd..db992df2 100644 --- a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java @@ -4,6 +4,7 @@ import static java.util.Objects.requireNonNull; import com.destroystokyo.paper.network.StatusClient; import com.destroystokyo.paper.profile.PlayerProfile; +import com.google.common.base.Strings; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; @@ -316,4 +317,25 @@ public class PaperServerListPingEvent extends ServerListPingEvent implements Can } } + // TODO: Remove in 1.13 + + @Override + @Deprecated + public List getSampleText() { + List sampleText = new ArrayList<>(); + for (PlayerProfile profile : getPlayerSample()) { + sampleText.add(Strings.nullToEmpty(profile.getName())); + } + return sampleText; + } + + @Override + @Deprecated + public void setSampleText(List sample) { + getPlayerSample().clear(); + for (String name : sample) { + getPlayerSample().add(Bukkit.createProfile(name)); + } + } + } diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java index cb8d0fcd..116d7c7a 100644 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java @@ -4,6 +4,7 @@ import java.net.InetAddress; import java.util.Iterator; import java.util.List; +import com.destroystokyo.paper.event.server.PaperServerListPingEvent; import org.apache.commons.lang.Validate; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; @@ -151,7 +152,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable private java.util.List sample; /** - * @deprecated Will be replaced in 1.13 + * @deprecated Will be removed in 1.13, use {@link PaperServerListPingEvent#getPlayerSample()} */ @Deprecated public void setSampleText(java.util.List sample) { @@ -159,7 +160,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable } /** - * @deprecated Will be replaced in 1.13 + * @deprecated Will be removed in 1.13, use {@link PaperServerListPingEvent#getPlayerSample()} */ @Deprecated public java.util.List getSampleText() { -- 2.17.1