diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
index 211ae4d74..7f5030f5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDecoratedPot.java
@@ -12,7 +12,9 @@ import org.bukkit.Material;
 import org.bukkit.Tag;
 import org.bukkit.World;
 import org.bukkit.block.DecoratedPot;
+import org.bukkit.craftbukkit.inventory.CraftInventoryDecoratedPot;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.inventory.DecoratedPotInventory;
 
 public class CraftDecoratedPot extends CraftBlockEntityState<DecoratedPotBlockEntity> implements DecoratedPot {
 
@@ -24,6 +26,20 @@ public class CraftDecoratedPot extends CraftBlockEntityState<DecoratedPotBlockEn
         super(state);
     }
 
+    @Override
+    public DecoratedPotInventory getSnapshotInventory() {
+        return new CraftInventoryDecoratedPot(this.getSnapshot());
+    }
+
+    @Override
+    public DecoratedPotInventory getInventory() {
+        if (!this.isPlaced()) {
+            return this.getSnapshotInventory();
+        }
+
+        return new CraftInventoryDecoratedPot(this.getTileEntity());
+    }
+
     @Override
     public void setSherd(Side face, Material sherd) {
         Preconditions.checkArgument(face != null, "face must not be null");
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDecoratedPot.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDecoratedPot.java
new file mode 100644
index 000000000..d9c700381
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDecoratedPot.java
@@ -0,0 +1,28 @@
+package org.bukkit.craftbukkit.inventory;
+
+import net.minecraft.world.IInventory;
+import org.bukkit.block.DecoratedPot;
+import org.bukkit.inventory.DecoratedPotInventory;
+import org.bukkit.inventory.ItemStack;
+
+public class CraftInventoryDecoratedPot extends CraftInventory implements DecoratedPotInventory {
+
+    public CraftInventoryDecoratedPot(IInventory inventory) {
+        super(inventory);
+    }
+
+    @Override
+    public void setItem(ItemStack item) {
+        setItem(0, item);
+    }
+
+    @Override
+    public ItemStack getItem() {
+        return getItem(0);
+    }
+
+    @Override
+    public DecoratedPot getHolder() {
+        return (DecoratedPot) inventory.getOwner();
+    }
+}