diff options
| author | Shane Freeder <[email protected]> | 2019-02-28 19:10:22 +0000 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-02-28 19:10:22 +0000 |
| commit | c66f02b1794c85f39f2e7164adf697f2b4e3aedc (patch) | |
| tree | a3d4ff5004ce5c0df713d1ecd49f845b923d9bec | |
| parent | 627b6dec02b91c9d9a2b7970fef4fc31b205b250 (diff) | |
| download | Paper-c66f02b1794c85f39f2e7164adf697f2b4e3aedc.tar.gz Paper-c66f02b1794c85f39f2e7164adf697f2b4e3aedc.zip | |
Backport: Fix NPE during server initialization from server list pings
| -rw-r--r-- | Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch index d30b180f49..08c92a02ee 100644 --- a/Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 25ff513d84565b3f16325cd6e338d2837fcad079 Mon Sep 17 00:00:00 2001 +From b46e189801a09043a8b19db57db7ff8a84fa08a5 Mon Sep 17 00:00:00 2001 From: Minecrell <[email protected]> Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -60,7 +60,7 @@ index 000000000..a2a409e63 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java new file mode 100644 -index 000000000..350410527 +index 000000000..a85466bc7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -0,0 +1,112 @@ @@ -90,7 +90,7 @@ index 000000000..350410527 + private GameProfile[] originalSample; + + private StandardPaperServerListPingEventImpl(MinecraftServer server, NetworkManager networkManager, ServerPing ping) { -+ super(server, new PaperStatusClient(networkManager), ping.getServerData().getProtocolVersion(), server.server.getServerIcon()); ++ super(server, new PaperStatusClient(networkManager), ping.getServerData() != null ? ping.getServerData().getProtocolVersion() : -1, server.server.getServerIcon()); + this.originalSample = ping.getPlayers() == null ? null : ping.getPlayers().getSample(); // GH-1473 - pre-tick race condition NPE + } + @@ -264,5 +264,5 @@ index cc1f3ac96..4f9fd4bc6 100644 } -- -2.18.0 +2.21.0 |