Merge pull request #1471 from mc-server/redstoneData

Use factory method to construct redstone simulator data

src/Chunk.cpp

@@ -92,7 +92,7 @@ cChunk::cChunk(
 	m_NeighborZP(a_NeighborZP),
 	m_WaterSimulatorData(a_World->GetWaterSimulator()->CreateChunkData()),
 	m_LavaSimulatorData (a_World->GetLavaSimulator ()->CreateChunkData()),
-	m_RedstoneSimulatorData(NULL),
+	m_RedstoneSimulatorData(a_World->GetRedstoneSimulator()->CreateChunkData()),
 	m_AlwaysTicked(0)
 {
 	if (a_NeighborXM != NULL)

src/Simulator/IncrementalRedstoneSimulator.inc

@@ -28,6 +28,11 @@ public:
 	}
 	~cIncrementalRedstoneSimulator();
 	
+	virtual cRedstoneSimulatorChunkData * CreateChunkData() override
+	{
+		return new cIncrementalRedstoneSimulatorChunkData;
+	}
+
 	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}  // not used
 	virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, ChunkType * a_Chunk) override;
 	virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override { return IsRedstone(a_BlockType); }

src/Simulator/NoopRedstoneSimulator.h

@@ -37,4 +37,9 @@ public:
 		UNUSED(a_Chunk);
 	}
 	
+	virtual cRedstoneSimulatorChunkData * CreateChunkData() override
+	{
+		return NULL;
+	}
+
 } ;

src/Simulator/RedstoneSimulator.h

@@ -25,4 +25,6 @@ public:
 	{
 	}
 	
+	virtual cRedstoneSimulatorChunkData * CreateChunkData() = 0;
+
 } ;