1 files changed, 75 insertions, 30 deletions

diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index b53507f17..3e1b86f3a 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -21,6 +21,7 @@ bool       g_BlockPistonBreakable[256];
 bool       g_BlockIsSnowable[256];
 bool       g_BlockRequiresSpecialTool[256];
 bool       g_BlockIsSolid[256];
+bool       g_BlockIsTorchPlaceable[256];
 
 
 
@@ -523,6 +524,7 @@ public:
 		memset(g_BlockTransparent,         0x00, sizeof(g_BlockTransparent));
 		memset(g_BlockOneHitDig,           0x00, sizeof(g_BlockOneHitDig));
 		memset(g_BlockPistonBreakable,     0x00, sizeof(g_BlockPistonBreakable));
+		memset(g_BlockIsTorchPlaceable,    0x00, sizeof(g_BlockIsTorchPlaceable));
 		
 		// Setting bools to true must be done manually, see http://forum.mc-server.org/showthread.php?tid=629&pid=5415#pid5415
 		for (int i = 0; i < ARRAYCOUNT(g_BlockIsSnowable); i++)
@@ -754,66 +756,109 @@ public:
 		g_BlockRequiresSpecialTool[E_BLOCK_VINES]                = true;
 
 		// Nonsolid Blocks:
+		g_BlockIsSolid[E_BLOCK_ACTIVATOR_RAIL]        = false;
 		g_BlockIsSolid[E_BLOCK_AIR]                   = false;
-		g_BlockIsSolid[E_BLOCK_BED]                   = false;
-		g_BlockIsSolid[E_BLOCK_BIRCH_WOOD_STAIRS]     = false;
-		g_BlockIsSolid[E_BLOCK_BRICK_STAIRS]          = false;
 		g_BlockIsSolid[E_BLOCK_BROWN_MUSHROOM]        = false;
-		g_BlockIsSolid[E_BLOCK_CACTUS]                = false;
-		g_BlockIsSolid[E_BLOCK_CAKE]                  = false;
-		g_BlockIsSolid[E_BLOCK_CHEST]                 = false;
-		g_BlockIsSolid[E_BLOCK_COBBLESTONE_STAIRS]    = false;
+		g_BlockIsSolid[E_BLOCK_CARROTS]               = false;
+		g_BlockIsSolid[E_BLOCK_COBWEB]                = false;
 		g_BlockIsSolid[E_BLOCK_CROPS]                 = false;
-		g_BlockIsSolid[E_BLOCK_ENCHANTMENT_TABLE]     = false;
+		g_BlockIsSolid[E_BLOCK_DETECTOR_RAIL]         = false;
 		g_BlockIsSolid[E_BLOCK_END_PORTAL]            = false;
-		g_BlockIsSolid[E_BLOCK_END_PORTAL_FRAME]      = false;
-		g_BlockIsSolid[E_BLOCK_FARMLAND]              = false;
-		g_BlockIsSolid[E_BLOCK_FENCE]                 = false;
 		g_BlockIsSolid[E_BLOCK_FIRE]                  = false;
-		g_BlockIsSolid[E_BLOCK_GLASS]                 = false;
-		g_BlockIsSolid[E_BLOCK_IRON_DOOR]             = false;
-		g_BlockIsSolid[E_BLOCK_JUNGLE_WOOD_STAIRS]    = false;
-		g_BlockIsSolid[E_BLOCK_LADDER]                = false;
+		g_BlockIsSolid[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE] = false;
 		g_BlockIsSolid[E_BLOCK_LAVA]                  = false;
-		g_BlockIsSolid[E_BLOCK_LEAVES]                = false;
 		g_BlockIsSolid[E_BLOCK_LEVER]                 = false;
-		g_BlockIsSolid[E_BLOCK_LOCKED_CHEST]          = false;
-		g_BlockIsSolid[E_BLOCK_NETHER_BRICK_STAIRS]   = false;
+		g_BlockIsSolid[E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE] = false;
+		g_BlockIsSolid[E_BLOCK_MELON_STEM]            = false;
 		g_BlockIsSolid[E_BLOCK_NETHER_PORTAL]         = false;
-		g_BlockIsSolid[E_BLOCK_PISTON]                = false;
-		g_BlockIsSolid[E_BLOCK_PISTON_EXTENSION]      = false;
-		g_BlockIsSolid[E_BLOCK_RAIL]                  = true;
-		g_BlockIsSolid[E_BLOCK_REDSTONE_REPEATER_OFF] = false;
-		g_BlockIsSolid[E_BLOCK_REDSTONE_REPEATER_ON]  = false;
+		g_BlockIsSolid[E_BLOCK_PISTON_MOVED_BLOCK]    = false;
+		g_BlockIsSolid[E_BLOCK_POTATOES]              = false;
+		g_BlockIsSolid[E_BLOCK_PUMPKIN_STEM]          = false;
+		g_BlockIsSolid[E_BLOCK_RAIL]                  = false;
 		g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_OFF]    = false;
 		g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_ON]     = false;
 		g_BlockIsSolid[E_BLOCK_REDSTONE_WIRE]         = false;
 		g_BlockIsSolid[E_BLOCK_RED_MUSHROOM]          = false;
 		g_BlockIsSolid[E_BLOCK_RED_ROSE]              = false;
 		g_BlockIsSolid[E_BLOCK_REEDS]                 = false;
-		g_BlockIsSolid[E_BLOCK_SANDSTONE_STAIRS]      = false;
 		g_BlockIsSolid[E_BLOCK_SAPLING]               = false;
 		g_BlockIsSolid[E_BLOCK_SIGN_POST]             = false;
 		g_BlockIsSolid[E_BLOCK_SNOW]                  = false;
-		g_BlockIsSolid[E_BLOCK_SPRUCE_WOOD_STAIRS]    = false;
 		g_BlockIsSolid[E_BLOCK_STATIONARY_LAVA]       = false;
 		g_BlockIsSolid[E_BLOCK_STATIONARY_WATER]      = false;
-		g_BlockIsSolid[E_BLOCK_STONE_BRICK_STAIRS]    = false;
 		g_BlockIsSolid[E_BLOCK_STONE_BUTTON]          = false;
 		g_BlockIsSolid[E_BLOCK_STONE_PRESSURE_PLATE]  = false;
-		g_BlockIsSolid[E_BLOCK_STONE_SLAB]            = false;
 		g_BlockIsSolid[E_BLOCK_TALL_GRASS]            = false;
-		g_BlockIsSolid[E_BLOCK_TNT]                   = false;
 		g_BlockIsSolid[E_BLOCK_TORCH]                 = false;
-		g_BlockIsSolid[E_BLOCK_TRAPDOOR]              = false;
+		g_BlockIsSolid[E_BLOCK_TRIPWIRE]              = false;
 		g_BlockIsSolid[E_BLOCK_VINES]                 = false;
 		g_BlockIsSolid[E_BLOCK_WALLSIGN]              = false;
 		g_BlockIsSolid[E_BLOCK_WATER]                 = false;
 		g_BlockIsSolid[E_BLOCK_WOODEN_BUTTON]         = false;
-		g_BlockIsSolid[E_BLOCK_WOODEN_DOOR]           = false;
 		g_BlockIsSolid[E_BLOCK_WOODEN_PRESSURE_PLATE] = false;
 		g_BlockIsSolid[E_BLOCK_WOODEN_SLAB]           = false;
 		g_BlockIsSolid[E_BLOCK_YELLOW_FLOWER]         = false;
+
+		// Torch placeable
+		g_BlockIsTorchPlaceable[E_BLOCK_BEDROCK]               = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_BLOCK_OF_COAL]         = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_BLOCK_OF_REDSTONE]     = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_BOOKCASE]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_BRICK]                 = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_CLAY]                  = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_COAL_ORE]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_COBBLESTONE]           = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_COMMAND_BLOCK]         = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_CRAFTING_TABLE]        = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DIAMOND_BLOCK]         = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DIAMOND_ORE]           = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DIRT]                  = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DISPENSER]             = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DOUBLE_STONE_SLAB]     = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DOUBLE_WOODEN_SLAB]    = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_DROPPER]               = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_EMERALD_BLOCK]         = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_EMERALD_ORE]           = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_END_STONE]             = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_FURNACE]               = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_GLOWSTONE]             = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_GOLD_BLOCK]            = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_GOLD_ORE]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_GRASS]                 = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_GRAVEL]                = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_HARDENED_CLAY]         = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_HAY_BALE]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_HUGE_BROWN_MUSHROOM]   = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_HUGE_RED_MUSHROOM]     = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_IRON_BLOCK]            = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_IRON_ORE]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_JACK_O_LANTERN]        = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_JUKEBOX]               = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_LAPIS_BLOCK]           = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_LAPIS_ORE]             = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_LOG]                   = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_MELON]                 = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_MOSSY_COBBLESTONE]     = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_MYCELIUM]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_NETHERRACK]            = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_NETHER_BRICK]          = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_NETHER_QUARTZ_ORE]     = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_NOTE_BLOCK]            = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_OBSIDIAN]              = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_PLANKS]                = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_PUMPKIN]               = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_QUARTZ_BLOCK]          = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_REDSTONE_LAMP_OFF]     = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_REDSTONE_LAMP_ON]      = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_REDSTONE_ORE]          = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_REDSTONE_ORE_GLOWING]  = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_SANDSTONE]             = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_SAND]                  = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_SILVERFISH_EGG]        = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_SPONGE]                = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_STAINED_CLAY]          = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_WOOL]                  = true;
+		g_BlockIsTorchPlaceable[E_BLOCK_STONE]                 = true;
 	}
 } BlockPropertiesInitializer;