diff --git a/Spigot-Server-Patches/Implement-a-few-1.8-features.patch b/Spigot-Server-Patches/Implement-a-few-1.8-features.patch
index 96640161c..a2f6c0358 100644
--- a/Spigot-Server-Patches/Implement-a-few-1.8-features.patch
+++ b/Spigot-Server-Patches/Implement-a-few-1.8-features.patch
@@ -397,6 +397,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      protected Item getLoot() {
+diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/HandshakeListener.java
++++ b/src/main/java/net/minecraft/server/HandshakeListener.java
+@@ -0,0 +0,0 @@ public class HandshakeListener implements PacketHandshakingInListener {
+             }
+             // CraftBukkit end
+ 
+-            if (packethandshakinginsetprotocol.d() > 5 && packethandshakinginsetprotocol.d() != 47) { // Spigot
++            // PaperSpigot start - DC non-1.8 clients
++            if (packethandshakinginsetprotocol.d() != 47) {
++                chatcomponenttext = new ChatComponentText( "You must join using a 1.8 client!" );
++                this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
++                this.b.close(chatcomponenttext);
++            } else if (packethandshakinginsetprotocol.d() > 5 && packethandshakinginsetprotocol.d() != 47) { // Spigot
++                // PaperSpigot end
+                 chatcomponenttext = new ChatComponentText( org.spigotmc.SpigotConfig.outdatedServerMessage ); // Spigot
+                 this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext), new GenericFutureListener[0]);
+                 this.b.close(chatcomponenttext);
 diff --git a/src/main/java/net/minecraft/server/Item.java b/src/main/java/net/minecraft/server/Item.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/Item.java