diff --git a/Spigot-Server-Patches/Fix-some-players-not-being-kicked-on-shutdown.patch b/Spigot-Server-Patches/Fix-some-players-not-being-kicked-on-shutdown.patch
new file mode 100644
index 0000000000..a0e2927a1a
--- /dev/null
+++ b/Spigot-Server-Patches/Fix-some-players-not-being-kicked-on-shutdown.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jedediah Smith <jedediah@silencegreys.com>
+Date: Tue, 29 Mar 2016 20:19:20 -0400
+Subject: [PATCH] Fix some players not being kicked on shutdown
+
+
+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 u() {
+-        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
++        // Paper start - Fix players being skipped due to concurrent list modification
++        for (EntityPlayer player : com.google.common.collect.ImmutableList.copyOf(this.players)) {
++            player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
+         }
++        // Paper end
+ 
+     }
+ 
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch
index b0140ac0eb..a1457c7ee8 100644
--- a/Spigot-Server-Patches/Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@
  package net.minecraft.server;
-
+ 
  import com.google.common.base.Charsets;
 +import com.google.common.base.Predicate; // Paper
  import com.google.common.collect.Lists;