diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java
index db46b0f4..f961288e 100644
--- a/server/src/main/java/server/world/Converter.java
+++ b/server/src/main/java/server/world/Converter.java
@@ -337,6 +337,8 @@ public abstract class Converter {
 	}
 	
 	private static void mapBlock(State state, int id, int data) {
+		if(BLOCK_MAP[(id << 4) | data] != 0)
+			Log.IO.debug("Remap: %s -> %d:%d", state.getId(), id, data);
 		BLOCK_MAP[(id << 4) | data] = (char)State.ID_MAP.get(state);
 	}
 	
@@ -545,59 +547,47 @@ public abstract class Converter {
         mapBlock(Blocks.detector_rail.getState().withProperty(BlockRailDetector.POWERED, true).withProperty(BlockRailDetector.SHAPE, EnumRailDirection.ASCENDING_WEST), 28, 11);
         mapBlock(Blocks.detector_rail.getState().withProperty(BlockRailDetector.POWERED, true).withProperty(BlockRailDetector.SHAPE, EnumRailDirection.ASCENDING_NORTH), 28, 12);
         mapBlock(Blocks.detector_rail.getState().withProperty(BlockRailDetector.POWERED, true).withProperty(BlockRailDetector.SHAPE, EnumRailDirection.ASCENDING_SOUTH), 28, 13);
-        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.DOWN), 29, 0, 6, 7);
-        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.UP), 29, 1);
+        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.DOWN), 29, 0, 7);
+        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.UP), 29, 1, 6);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.NORTH), 29, 2);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.SOUTH), 29, 3);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.WEST), 29, 4);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.EAST), 29, 5);
-        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.DOWN), 29, 8, 14, 15);
-        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.UP), 29, 9);
+        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.DOWN), 29, 8, 15);
+        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.UP), 29, 9, 14);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.NORTH), 29, 10);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.SOUTH), 29, 11);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.WEST), 29, 12);
         mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.EAST), 29, 13);
-        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.FACING, Facing.UP)
-        		.withProperty(BlockPistonBase.EXTENDED, false), 29, 6);
-        mapBlock(Blocks.sticky_piston.getState().withProperty(BlockPistonBase.FACING, Facing.UP)
-        		.withProperty(BlockPistonBase.EXTENDED, true), 29, 14);
         mapBlock(Blocks.web, 30);
         mapBlock(Blocks.dead_bush.getState(), 31);
         mapBlock(Blocks.tallgrass.getState(), 31, 1);
         mapBlock(Blocks.fern.getState(), 31, 2);
         mapBlock(Blocks.deadbush, 32);
-        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.DOWN), 33, 0, 6, 7);
-        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.UP), 33, 1);
+        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.DOWN), 33, 0, 7);
+        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.UP), 33, 1, 6);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.NORTH), 33, 2);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.SOUTH), 33, 3);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.WEST), 33, 4);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, false).withProperty(BlockPistonBase.FACING, Facing.EAST), 33, 5);
-        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.DOWN), 33, 8, 14, 15);
-        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.UP), 33, 9);
+        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.DOWN), 33, 8, 15);
+        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.UP), 33, 9, 14);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.NORTH), 33, 10);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.SOUTH), 33, 11);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.WEST), 33, 12);
         mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.EXTENDED, true).withProperty(BlockPistonBase.FACING, Facing.EAST), 33, 13);
-        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.FACING, Facing.UP)
-        		.withProperty(BlockPistonBase.EXTENDED, false), 33, 6);
-        mapBlock(Blocks.piston.getState().withProperty(BlockPistonBase.FACING, Facing.UP)
-        		.withProperty(BlockPistonBase.EXTENDED, true), 33, 14);
-        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.DOWN).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 0, 6, 7);
-        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.UP).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 1);
+        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.DOWN).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 0, 7);
+        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.UP).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 1, 6);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.NORTH).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 2);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.SOUTH).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 3);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.WEST).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 4);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.EAST).withProperty(BlockPistonHead.TYPE, EnumPistonType.DEFAULT), 34, 5);
-        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.DOWN).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 8, 14, 15);
-        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.UP).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 9);
+        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.DOWN).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 8, 15);
+        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.UP).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 9, 14);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.NORTH).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 10);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.SOUTH).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 11);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.WEST).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 12);
         mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.EAST).withProperty(BlockPistonHead.TYPE, EnumPistonType.STICKY), 34, 13);
-        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.UP)
-        		.withProperty(BlockPistonHead.TYPE, BlockPistonHead.EnumPistonType.DEFAULT), 34, 6);
-        mapBlock(Blocks.piston_head.getState().withProperty(BlockPistonHead.FACING, Facing.UP)
-        		.withProperty(BlockPistonHead.TYPE, BlockPistonHead.EnumPistonType.STICKY), 34, 14);
         mapBlock(new BlockFunction() {
 			public State getState(int id, int data) {
 				return BlockWool.getByColor(DyeColor.byMetadata(data)).getState();