--- a/net/minecraft/world/inventory/ContainerLoom.java
+++ b/net/minecraft/world/inventory/ContainerLoom.java
@@ -18,8 +18,30 @@
 import net.minecraft.world.level.block.entity.EnumBannerPatternType;
 import net.minecraft.world.level.block.entity.TileEntityTypes;
 
+// CraftBukkit start
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.inventory.CraftInventoryLoom;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+import org.bukkit.entity.Player;
+// CraftBukkit end
+
 public class ContainerLoom extends Container {
 
+    // CraftBukkit start
+    private CraftInventoryView bukkitEntity = null;
+    private Player player;
+
+    @Override
+    public CraftInventoryView getBukkitView() {
+        if (bukkitEntity != null) {
+            return bukkitEntity;
+        }
+
+        CraftInventoryLoom inventory = new CraftInventoryLoom(this.inputContainer, this.outputContainer);
+        bukkitEntity = new CraftInventoryView(this.player, inventory, this);
+        return bukkitEntity;
+    }
+    // CraftBukkit end
     private static final int INV_SLOT_START = 4;
     private static final int INV_SLOT_END = 31;
     private static final int USE_ROW_SLOT_START = 31;
@@ -51,6 +73,13 @@
                 ContainerLoom.this.slotsChanged(this);
                 ContainerLoom.this.slotUpdateListener.run();
             }
+
+            // CraftBukkit start
+            @Override
+            public Location getLocation() {
+                return containeraccess.getLocation();
+            }
+            // CraftBukkit end
         };
         this.outputContainer = new InventorySubcontainer(1) {
             @Override
@@ -58,6 +87,13 @@
                 super.setChanged();
                 ContainerLoom.this.slotUpdateListener.run();
             }
+
+            // CraftBukkit start
+            @Override
+            public Location getLocation() {
+                return containeraccess.getLocation();
+            }
+            // CraftBukkit end
         };
         this.access = containeraccess;
         this.bannerSlot = this.addSlot(new Slot(this.inputContainer, 0, 13, 26) {
@@ -118,6 +154,7 @@
         }
 
         this.addDataSlot(this.selectedBannerPatternIndex);
+        player = (Player) playerinventory.player.getBukkitEntity(); // CraftBukkit
     }
 
     public int getSelectedBannerPatternIndex() {
@@ -126,6 +163,7 @@
 
     @Override
     public boolean stillValid(EntityHuman entityhuman) {
+        if (!this.checkReachable) return true; // CraftBukkit
         return stillValid(this.access, entityhuman, Blocks.LOOM);
     }
 
@@ -248,6 +286,11 @@
 
                 if (nbttagcompound != null && nbttagcompound.contains("Patterns", 9)) {
                     nbttaglist = nbttagcompound.getList("Patterns", 10);
+                    // CraftBukkit start
+                    while (nbttaglist.size() > 20) {
+                        nbttaglist.remove(20);
+                    }
+                    // CraftBukkit end
                 } else {
                     nbttaglist = new NBTTagList();
                     if (nbttagcompound == null) {