twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-27 10:23:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE during server initialization from server list pings

Browse Source
This commit is contained in:
Shane Freeder
2019-02-06 19:15:46 +00:00
parent d601e3dc2f
commit 9bca846f08
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Spigot-API-Patches/Add-extended-PaperServerListPingEvent.patch
View File

@@ -8,7 +8,7 @@ and allows full control of the response sent to the client.
diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
new file mode 100644 new file mode 100644
index 00000000..dd1deafd index 00000000..b2a8476c
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -185,7 +185,8 @@ index 00000000..dd1deafd
+ * Returns the protocol version that will be sent as the protocol version + * Returns the protocol version that will be sent as the protocol version
+ * of the server to the client. + * of the server to the client.
+ * + *
+ * @return The protocol version of the server + * @return The protocol version of the server, or {@code -1} if the server
+ * has not finished initialization yet
+ */ + */
+ public int getProtocolVersion() { + public int getProtocolVersion() {
+ return protocolVersion; + return protocolVersion;

4
Spigot-Server-Patches/Implement-extended-PaperServerListPingEvent.patch
View File

@@ -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 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 new file mode 100644
index 000000000..26e3031d2 index 000000000..a85466bc7
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -90,7 +90,7 @@ index 000000000..26e3031d2
+ private GameProfile[] originalSample; + private GameProfile[] originalSample;
+ +
+ private StandardPaperServerListPingEventImpl(MinecraftServer server, NetworkManager networkManager, ServerPing ping) { + 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 + this.originalSample = ping.getPlayers() == null ? null : ping.getPlayers().getSample(); // GH-1473 - pre-tick race condition NPE
+ } + }
+ +