diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
index 9fb32a82fb..bf6841c93e 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
@@ -140,14 +140,12 @@ public class CraftBlockState implements BlockState {
         Block block = getBlock();
 
         if (block.getType() != getType()) {
-            if (force) {
-                block.setTypeId(getTypeId(), applyPhysics);
-            } else {
+            if (!force) {
                 return false;
             }
         }
 
-        block.setData(getRawData(), applyPhysics);
+        block.setTypeIdAndData(getTypeId(), getRawData(), applyPhysics);
         world.getHandle().notify(new BlockPosition(x, y, z));
 
         return true;