Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SPIGOT-5867, MC-193339: NPE during shutdown when rcon enabled with no password

This commit is contained in:
md_5 2020-07-03 09:23:33 +10:00
parent 068618eb5b
commit 94eff632f1
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nms-patches/RemoteControlListener.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/net/minecraft/server/RemoteControlListener.java
+++ b/net/minecraft/server/RemoteControlListener.java
@@ -109,7 +109,7 @@
RemoteControlListener.LOGGER.debug("closeSocket: {}", serversocket);
try {
- serversocket.close();
+ if (serversocket != null) serversocket.close(); // CraftBukkit - SPIGOT-5867, MC-193339: NPE during shutdown if no password
} catch (IOException ioexception) {
RemoteControlListener.LOGGER.warn("Failed to close socket", ioexception);
}