diff --git a/Spigot-Server-Patches/Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/Add-missing-coverages-for-getTileEntity-in-order-to-.patch
new file mode 100644
index 000000000..aeb550c30
--- /dev/null
+++ b/Spigot-Server-Patches/Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Sat, 22 Jul 2017 15:22:59 +0100
+Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
+ to avoid exeptions when calling getTileEntity
+
+
+diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index bde48b692..34a974617 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
++++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+                 result = fixTileEntity(pos, type, result);
+             }
+         }
++        // Paper Start - add TE fix checks for shulkers, see nms.BlockShulkerBox
++        else if (type instanceof BlockShulkerBox) {
++            if (!(result instanceof TileEntityShulkerBox)) {
++                result = fixTileEntity(pos, type, result);
++            }
++        }
++        // Paper end
+ 
+         return result;
+     }
+--
\ No newline at end of file