3 files changed, 10 insertions, 10 deletions

diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 0ee33a3bc..e447437d4 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -168,7 +168,7 @@ bool cFireSimulator::IsFuel(BLOCKTYPE a_BlockType)
 		case E_BLOCK_PLANKS:
 		case E_BLOCK_DOUBLE_WOODEN_SLAB:
 		case E_BLOCK_WOODEN_SLAB:
-		case E_BLOCK_WOODEN_STAIRS:
+		case E_BLOCK_OAK_WOOD_STAIRS:
 		case E_BLOCK_SPRUCE_WOOD_STAIRS:
 		case E_BLOCK_BIRCH_WOOD_STAIRS:
 		case E_BLOCK_JUNGLE_WOOD_STAIRS:
@@ -184,7 +184,7 @@ bool cFireSimulator::IsFuel(BLOCKTYPE a_BlockType)
 		case E_BLOCK_JUNGLE_FENCE:
 		case E_BLOCK_DARK_OAK_FENCE:
 		case E_BLOCK_ACACIA_FENCE:
-		case E_BLOCK_FENCE_GATE:
+		case E_BLOCK_OAK_FENCE_GATE:
 		case E_BLOCK_SPRUCE_FENCE_GATE:
 		case E_BLOCK_BIRCH_FENCE_GATE:
 		case E_BLOCK_JUNGLE_FENCE_GATE:
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp
index 7d9cc93b2..ba921a57e 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator.cpp
@@ -220,7 +220,7 @@ void cIncrementalRedstoneSimulator::SimulateChunk(std::chrono::milliseconds a_Dt
 				case E_BLOCK_DARK_OAK_DOOR:
 				case E_BLOCK_JUNGLE_DOOR:
 				case E_BLOCK_SPRUCE_DOOR:
-				case E_BLOCK_WOODEN_DOOR:
+				case E_BLOCK_OAK_DOOR:
 				case E_BLOCK_IRON_DOOR:
 				{
 					HandleDoor(dataitr->first.x, dataitr->first.y, dataitr->first.z);
@@ -229,7 +229,7 @@ void cIncrementalRedstoneSimulator::SimulateChunk(std::chrono::milliseconds a_Dt
 				case E_BLOCK_ACACIA_FENCE_GATE:
 				case E_BLOCK_BIRCH_FENCE_GATE:
 				case E_BLOCK_DARK_OAK_FENCE_GATE:
-				case E_BLOCK_FENCE_GATE:
+				case E_BLOCK_OAK_FENCE_GATE:
 				case E_BLOCK_JUNGLE_FENCE_GATE:
 				case E_BLOCK_SPRUCE_FENCE_GATE:
 				{
@@ -961,7 +961,7 @@ void cIncrementalRedstoneSimulator::HandleDoor(int a_RelBlockX, int a_RelBlockY,
 	int BlockX = (m_Chunk->GetPosX() * cChunkDef::Width) + a_RelBlockX;
 	int BlockZ = (m_Chunk->GetPosZ() * cChunkDef::Width) + a_RelBlockZ;
 
-	typedef GetHandlerCompileTime<E_BLOCK_WOODEN_DOOR>::type DoorHandler;
+	typedef GetHandlerCompileTime<E_BLOCK_OAK_DOOR>::type DoorHandler;
 
 	if (AreCoordsPowered(a_RelBlockX, a_RelBlockY, a_RelBlockZ))
 	{
diff --git a/src/Simulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator.h
index e4250c0b9..394250800 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.h
+++ b/src/Simulator/IncrementalRedstoneSimulator.h
@@ -272,7 +272,7 @@ private:
 			case E_BLOCK_DARK_OAK_FENCE_GATE:
 			case E_BLOCK_DISPENSER:
 			case E_BLOCK_DROPPER:
-			case E_BLOCK_FENCE_GATE:
+			case E_BLOCK_OAK_FENCE_GATE:
 			case E_BLOCK_HOPPER:
 			case E_BLOCK_INACTIVE_COMPARATOR:
 			case E_BLOCK_IRON_DOOR:
@@ -292,7 +292,7 @@ private:
 			case E_BLOCK_STICKY_PISTON:
 			case E_BLOCK_TNT:
 			case E_BLOCK_TRAPDOOR:
-			case E_BLOCK_WOODEN_DOOR:
+			case E_BLOCK_OAK_DOOR:
 			{
 				return true;
 			}
@@ -348,7 +348,7 @@ private:
 			case E_BLOCK_DETECTOR_RAIL:
 			case E_BLOCK_DISPENSER:
 			case E_BLOCK_DROPPER:
-			case E_BLOCK_FENCE_GATE:
+			case E_BLOCK_OAK_FENCE_GATE:
 			case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE:
 			case E_BLOCK_HOPPER:
 			case E_BLOCK_INACTIVE_COMPARATOR:
@@ -378,7 +378,7 @@ private:
 			case E_BLOCK_TRIPWIRE_HOOK:
 			case E_BLOCK_TRIPWIRE:
 			case E_BLOCK_WOODEN_BUTTON:
-			case E_BLOCK_WOODEN_DOOR:
+			case E_BLOCK_OAK_DOOR:
 			case E_BLOCK_WOODEN_PRESSURE_PLATE:
 			case E_BLOCK_PISTON:
 			{
@@ -395,7 +395,7 @@ private:
 			case E_BLOCK_ACACIA_FENCE_GATE:
 			case E_BLOCK_BIRCH_FENCE_GATE:
 			case E_BLOCK_DARK_OAK_FENCE_GATE:
-			case E_BLOCK_FENCE_GATE:
+			case E_BLOCK_OAK_FENCE_GATE:
 			case E_BLOCK_JUNGLE_FENCE_GATE:
 			case E_BLOCK_SPRUCE_FENCE_GATE:
 			case E_BLOCK_IRON_TRAPDOOR: