diff --git a/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
new file mode 100644
index 0000000000..17d257467a
--- /dev/null
+++ b/Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 13 Apr 2016 00:25:28 -0400
+Subject: [PATCH] Remove unused World Tile Entity List
+
+Massive hit to performance and it is completely unnecessary.
+
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+     };
+     // Spigot end
+     protected final Set<Entity> f = Sets.newHashSet(); // Paper
+-    public final List<TileEntity> tileEntityList = Lists.newArrayList();
++    //public final List<TileEntity> tileEntityList = Lists.newArrayList(); // Paper - remove unused list
+     public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
+     private final List<TileEntity> b = Lists.newArrayList();
+     private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+         // CraftBukkit start - From below, clean up tile entities before ticking them
+         if (!this.tileEntityListUnload.isEmpty()) {
+             this.tileEntityListTick.removeAll(this.tileEntityListUnload);
+-            this.tileEntityList.removeAll(this.tileEntityListUnload);
++            //this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list
+             this.tileEntityListUnload.clear();
+         }
+         // CraftBukkit end
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+             if (tileentity.x()) {
+                 tilesThisCycle--;
+                 this.tileEntityListTick.remove(tileTickPosition--);
+-                this.tileEntityList.remove(tileentity);
++                //this.tileEntityList.remove(tileentity); // Paper - remove unused list
+                 if (this.isLoaded(tileentity.getPosition())) {
+                     this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
+                 }
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+                         this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
+                         // CraftBukkit start
+                         // From above, don't screw this up - SPIGOT-1746
+-                        if (!this.tileEntityList.contains(tileentity1)) {
++                        if (true) { // Paper - remove unused list
+                             this.a(tileentity1);
+                         }
+                         // CraftBukkit end
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+     protected void l() {}
+ 
+     public boolean a(TileEntity tileentity) {
+-        boolean flag = this.tileEntityList.add(tileentity);
++        boolean flag = true; // Paper - remove unused list
+ 
+-        if (flag && tileentity instanceof ITickable) {
++        if (flag && tileentity instanceof ITickable && !this.tileEntityListTick.contains(tileentity)) { // Paper
+             this.tileEntityListTick.add(tileentity);
+         }
+ 
+@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
+         } else {
+             if (tileentity != null) {
+                 this.b.remove(tileentity);
+-                this.tileEntityList.remove(tileentity);
++                //this.tileEntityList.remove(tileentity); // Paper - remove unused list
+                 this.tileEntityListTick.remove(tileentity);
+             }
+ 
+--
\ No newline at end of file