From 003c0e0766c0692577269ae24e9bcb53dcfad283 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 23:55:30 -0400 Subject: [PATCH] Fix NPE race condition in ServerListPingEvent Fixes GH-1473 If a ping is responded to prior to the server sample being populated (pre-tick as an example) it can result in an NPE. --- .../0240-Implement-extended-PaperServerListPingEvent.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch index 2216f2d28a..7069eadc65 100644 --- a/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0240-Implement-extended-PaperServerListPingEvent.patch @@ -91,7 +91,7 @@ index 0000000000..350410527b + + private StandardPaperServerListPingEventImpl(MinecraftServer server, NetworkManager networkManager, ServerPing ping) { + super(server, new PaperStatusClient(networkManager), ping.getServerData().getProtocolVersion(), server.server.getServerIcon()); -+ this.originalSample = ping.getPlayers().getSample(); ++ this.originalSample = ping.getPlayers() == null ? null : ping.getPlayers().getSample(); // GH-1473 - pre-tick race condition NPE + } + + @Nonnull