diff --git a/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch
new file mode 100644
index 0000000000..d5acb0909d
--- /dev/null
+++ b/Spigot-Server-Patches/Ensure-inv-drag-is-in-bounds.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joseph Hirschfeld <joe@ibj.io>
+Date: Sat, 20 Feb 2016 02:19:31 -0500
+Subject: [PATCH] Ensure inv drag is in bounds
+
+
+diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/Container.java
++++ b/src/main/java/net/minecraft/server/Container.java
+@@ -0,0 +0,0 @@ public abstract class Container {
+                     this.d();
+                 }
+             } else if (this.g == 1) {
+-                Slot slot = (Slot) this.c.get(i);
++                Slot slot = i < this.c.size() ? this.c.get(i) : null; // Paper - Ensure drag in bounds
+ 
+                 if (slot != null && a(slot, playerinventory.getCarried(), true) && slot.isAllowed(playerinventory.getCarried()) && playerinventory.getCarried().count > this.h.size() && this.b(slot)) {
+                     this.h.add(slot);
+--
\ No newline at end of file