diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 62c7109052..8732e7a824 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -437,6 +437,12 @@ public class Chunk {
                     }
 
                     if (Block.byId[l] instanceof BlockContainer) {
+                        // CraftBukkit start - don't create tile entity if placement failed
+                        if (this.getTypeId(i, j, k) != l) {
+                            return false;
+                        }
+                        // CraftBukkit end
+
                         tileentity = this.e(i, j, k);
                         if (tileentity == null) {
                             tileentity = ((BlockContainer) Block.byId[l]).a(this.world);