diff --git a/Spigot-Server-Patches/Fix-kick-messages.patch b/Spigot-Server-Patches/Fix-kick-messages.patch
new file mode 100644
index 0000000000..eef3237e79
--- /dev/null
+++ b/Spigot-Server-Patches/Fix-kick-messages.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/PlayerList.java
++++ b/src/main/java/net/minecraft/server/PlayerList.java
+@@ -0,0 +0,0 @@ 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
+