OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 03:52:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-2622: Ensure all players are safely disconnected on shutdown

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-08-23 14:02:48 +10:00
parent cf6a18e39f
commit 7b4d8c3f3f
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
paper-server/nms-patches/PlayerList.patch
View file

@ -841,24 +841,28 @@
} }
public boolean getHasWhitelist() { public boolean getHasWhitelist() {
@@ -836,16 +1270,26 @@ @@ -835,17 +1269,29 @@
}
public void u() { public void u() {
for (int i = 0; i < this.players.size(); ++i) { - for (int i = 0; i < this.players.size(); ++i) {
- ((EntityPlayer) this.players.get(i)).playerConnection.disconnect("Server closed"); - ((EntityPlayer) this.players.get(i)).playerConnection.disconnect("Server closed");
+ ((EntityPlayer) this.players.get(i)).playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message + // CraftBukkit start - disconnect safely
+ for (EntityPlayer player : this.players) {
+ player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
} }
+ // CraftBukkit end
} +
+ }
+ // CraftBukkit start + // CraftBukkit start
+ public void sendMessage(IChatBaseComponent[] iChatBaseComponents) { + public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
+ for (IChatBaseComponent component : iChatBaseComponents) { + for (IChatBaseComponent component : iChatBaseComponents) {
+ sendMessage(component, true); + sendMessage(component, true);
+ } + }
+ } }
+ // CraftBukkit end + // CraftBukkit end
+
public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) { public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) {
this.server.sendMessage(ichatbasecomponent); this.server.sendMessage(ichatbasecomponent);
int i = flag ? 1 : 0; int i = flag ? 1 : 0;
@ -870,7 +874,7 @@
} }
public void sendMessage(IChatBaseComponent ichatbasecomponent) { public void sendMessage(IChatBaseComponent ichatbasecomponent) {
@@ -882,8 +1326,10 @@ @@ -882,8 +1328,10 @@
WorldServer[] aworldserver = this.server.worldServer; WorldServer[] aworldserver = this.server.worldServer;
int j = aworldserver.length; int j = aworldserver.length;