mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
Fix kick messages
This commit is contained in:
parent
8f0aaf3411
commit
3fba354aa5
41
Spigot-Server-Patches/0044-Fix-kick-messages.patch
Normal file
41
Spigot-Server-Patches/0044-Fix-kick-messages.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From fe9819d75b488b738cac8ba273668e4746acbb64 Mon Sep 17 00:00:00 2001
|
||||
From: Howaner <franzi.moos@googlemail.com>
|
||||
Date: Sat, 3 Jan 2015 18:25:24 -0600
|
||||
Subject: [PATCH] Fix kick messages
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 8d97824..ef4d867 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -170,8 +170,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
// CraftBukkit end
|
||||
ChatComponentText chatcomponenttext = new ChatComponentText(s);
|
||||
|
||||
- this.a(chatcomponenttext); // CraftBukkit - fire quit instantly
|
||||
this.networkManager.a(new PacketPlayOutKickDisconnect(chatcomponenttext), new PlayerConnectionFuture(this, chatcomponenttext), new GenericFutureListener[0]);
|
||||
+ this.a(chatcomponenttext); // CraftBukkit - fire quit instantly // PaperSpigot - Moved down
|
||||
this.networkManager.k();
|
||||
this.minecraftServer.postToMainThread(new PlayerConnectionDisconnector(this)); // CraftBukkit - Don't wait
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index cc2cc30..19657f0 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1147,9 +1147,11 @@ public abstract class PlayerList {
|
||||
}
|
||||
|
||||
public void v() {
|
||||
- for (int i = 0; i < this.players.size(); ++i) {
|
||||
- ((EntityPlayer) this.players.get(i)).playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
|
||||
+ // PaperSpigot start - for -> while
|
||||
+ while (!this.players.isEmpty()) {
|
||||
+ ((EntityPlayer) this.players.get(0)).playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
|
||||
}
|
||||
+ // PaperSpigot end
|
||||
}
|
||||
|
||||
// CraftBukkit start
|
||||
--
|
||||
1.9.5.msysgit.0
|
||||
|
Loading…
Reference in New Issue
Block a user