7 files changed, 10 insertions, 10 deletions

diff --git a/src/Items/ItemDoor.h b/src/Items/ItemDoor.h
index e92c567fb..a74997b7d 100644
--- a/src/Items/ItemDoor.h
+++ b/src/Items/ItemDoor.h
@@ -49,7 +49,7 @@ public:
 		BLOCKTYPE BlockType;
 		switch (m_ItemType)
 		{
-			case E_ITEM_WOODEN_DOOR:   BlockType = E_BLOCK_WOODEN_DOOR;   break;
+			case E_ITEM_WOODEN_DOOR:   BlockType = E_BLOCK_OAK_DOOR;      break;
 			case E_ITEM_IRON_DOOR:     BlockType = E_BLOCK_IRON_DOOR;     break;
 			case E_ITEM_SPRUCE_DOOR:   BlockType = E_BLOCK_SPRUCE_DOOR;   break;
 			case E_ITEM_BIRCH_DOOR:    BlockType = E_BLOCK_BIRCH_DOOR;    break;
diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h
index fba8c0a2c..98352bd2d 100644
--- a/src/Items/ItemEmptyMap.h
+++ b/src/Items/ItemEmptyMap.h
@@ -43,8 +43,8 @@ public:
 
 		const int RegionWidth = cChunkDef::Width * 8;
 
-		int CenterX = (int)(floor(a_Player->GetPosX() / (float) RegionWidth) * RegionWidth);
-		int CenterZ = (int)(floor(a_Player->GetPosZ() / (float) RegionWidth) * RegionWidth);
+		int CenterX = FloorC(a_Player->GetPosX() / RegionWidth) * RegionWidth + (RegionWidth / 2);
+		int CenterZ = FloorC(a_Player->GetPosZ() / RegionWidth) * RegionWidth + (RegionWidth / 2);
 
 		cMap * NewMap = a_World->GetMapManager().CreateMap(CenterX, CenterZ, DEFAULT_SCALE);
 
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index a1fa67152..aa5f6109b 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -587,6 +587,7 @@ char cItemHandler::GetMaxStackSize(void)
 		case E_ITEM_DYE:                  return 64;
 		case E_ITEM_EGG:                  return 16;
 		case E_ITEM_EMERALD:              return 64;
+		case E_ITEM_EMPTY_MAP:            return 64;
 		case E_ITEM_ENDER_PEARL:          return 16;
 		case E_ITEM_EYE_OF_ENDER:         return 64;
 		case E_ITEM_FEATHER:              return 64;
@@ -732,7 +733,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_DEAD_BUSH:
 		case E_BLOCK_DIAMOND_BLOCK:
 		case E_BLOCK_DIAMOND_ORE:
-		case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
+		case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB:
 		case E_BLOCK_DOUBLE_STONE_SLAB:
 		case E_BLOCK_EMERALD_ORE:
 		case E_BLOCK_ENCHANTMENT_TABLE:
@@ -752,7 +753,7 @@ bool cItemHandler::CanHarvestBlock(BLOCKTYPE a_BlockType)
 		case E_BLOCK_NETHER_BRICK_STAIRS:
 		case E_BLOCK_NETHER_BRICK_FENCE:
 		case E_BLOCK_NETHERRACK:
-		case E_BLOCK_NEW_STONE_SLAB:
+		case E_BLOCK_RED_SANDSTONE_SLAB:
 		case E_BLOCK_OBSIDIAN:
 		case E_BLOCK_PACKED_ICE:
 		case E_BLOCK_PRISMARINE_BLOCK:
diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h
index 684b55788..be2e2fade 100644
--- a/src/Items/ItemHandler.h
+++ b/src/Items/ItemHandler.h
@@ -88,7 +88,7 @@ public:
 		UNUSED(a_BlockFace);
 	}
 
-	/** Called every tick while the item is on the player's inventory (Used by maps) - For now, called only for equipped items */
+	/** Called every tick while the item is on the player's inventory (used by maps, for example) - For now, called only for equipped items */
 	virtual void OnUpdate(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item)
 	{
 		UNUSED(a_World);
diff --git a/src/Items/ItemMap.h b/src/Items/ItemMap.h
index 2dbbb3dc0..a96183f41 100644
--- a/src/Items/ItemMap.h
+++ b/src/Items/ItemMap.h
@@ -37,7 +37,6 @@ public:
 		}
 
 		Map->UpdateRadius(*a_Player, DEFAULT_RADIUS);
-
 		Map->UpdateClient(a_Player);
 	}
 } ;
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index b5dc179f8..1d5abddb6 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -65,7 +65,7 @@ public:
 			case E_BLOCK_COBBLESTONE:
 			case E_BLOCK_COBBLESTONE_STAIRS:
 			case E_BLOCK_COBBLESTONE_WALL:
-			case E_BLOCK_DOUBLE_NEW_STONE_SLAB:
+			case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB:
 			case E_BLOCK_DOUBLE_STONE_SLAB:
 			case E_BLOCK_ENCHANTMENT_TABLE:
 			case E_BLOCK_END_STONE:
@@ -76,7 +76,7 @@ public:
 			case E_BLOCK_NETHER_BRICK:
 			case E_BLOCK_NETHER_BRICK_STAIRS:
 			case E_BLOCK_NETHERRACK:
-			case E_BLOCK_NEW_STONE_SLAB:
+			case E_BLOCK_RED_SANDSTONE_SLAB:
 			case E_BLOCK_PRISMARINE_BLOCK:
 			case E_BLOCK_RED_SANDSTONE:
 			case E_BLOCK_RED_SANDSTONE_STAIRS:
diff --git a/src/Items/ItemRedstoneDust.h b/src/Items/ItemRedstoneDust.h
index 6d5fb521f..87f351654 100644
--- a/src/Items/ItemRedstoneDust.h
+++ b/src/Items/ItemRedstoneDust.h
@@ -61,7 +61,7 @@ public:
 
 		switch (a_BlockType)
 		{
-			case E_BLOCK_NEW_STONE_SLAB:
+			case E_BLOCK_RED_SANDSTONE_SLAB:
 			case E_BLOCK_WOODEN_SLAB:
 			case E_BLOCK_STONE_SLAB:
 			{