diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 5d4e51f05a..54e244c8f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -267,7 +267,11 @@ public class CraftBlock implements Block {
 
     @Override
     public boolean equals(Object o) {
-        return this == o;
+        if (o == this) return true;
+        if (!(o instanceof CraftBlock)) return false;
+        CraftBlock other = (CraftBlock) o;
+
+        return this.x == other.x && this.y == other.y && this.z == other.z && this.getWorld().equals(other.getWorld());
     }
 
     public boolean isBlockFacePowered(BlockFace face) {