Merge pull request #648 from ampayne2/carpet

Carpet now breaks if block below destroyed. Completes Vanilla-422
spoutdev · Oct 17, 2013 · acea8b6 · acea8b6
2 parents df9e3d6 + f2151d0
commit acea8b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/spout/vanilla/material/block/Solid.java b/src/main/java/org/spout/vanilla/material/block/Solid.java
@@ -64,8 +64,8 @@ public MoveReaction getMoveReaction(Block block) {
 
 	@Override
 	public boolean canSupport(BlockMaterial material, BlockFace face) {
-		// Solids only support fire on top
-		if (material.isMaterial(VanillaMaterials.FIRE)) {
+		// Solids only support fire and carpet on top
+		if (material.isMaterial(VanillaMaterials.FIRE, VanillaMaterials.CARPET)) {
 			return face == BlockFace.TOP;
 		}
 

diff --git a/src/main/java/org/spout/vanilla/material/block/solid/Carpet.java b/src/main/java/org/spout/vanilla/material/block/solid/Carpet.java
@@ -26,9 +26,13 @@
  */
 package org.spout.vanilla.material.block.solid;
 
+import org.spout.api.geo.cuboid.Block;
+import org.spout.api.material.BlockMaterial;
+import org.spout.api.material.block.BlockFace;
 import org.spout.vanilla.data.effect.store.SoundEffects;
 import org.spout.vanilla.data.resources.VanillaMaterialModels;
 import org.spout.vanilla.material.Burnable;
+import org.spout.vanilla.material.VanillaMaterials;
 import org.spout.vanilla.material.block.Solid;
 import org.spout.vanilla.material.block.solid.Wool.WoolColor;
 
@@ -76,4 +80,12 @@ public int getCombustChance() {
 	public WoolColor getColor() {
 		return color;
 	}
+
+	@Override
+	public void onUpdate(BlockMaterial oldMaterial, Block block) {
+		super.onUpdate(oldMaterial, block);
+		if (block.translate(BlockFace.BOTTOM).isMaterial(VanillaMaterials.AIR)) {
+			this.destroy(block, toCause(block));
+		}
+	}
 }