diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 3169e0dd7..cab4872c9 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1106,6 +1106,10 @@
 					RelativePath="..\source\Simulator\FluidSimulator.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\Simulator\NoopFluidSimulator.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\Simulator\RedstoneSimulator.cpp"
 					>
diff --git a/source/Simulator/NoopFluidSimulator.h b/source/Simulator/NoopFluidSimulator.h
new file mode 100644
index 000000000..9120fe868
--- /dev/null
+++ b/source/Simulator/NoopFluidSimulator.h
@@ -0,0 +1,36 @@
+
+// NoopFluidSimulator.h
+
+// Declares the cNoopFluidSimulator class representing a fluid simulator that performs nothing, it ignores all blocks
+
+
+
+
+
+#pragma once
+
+#include "FluidSimulator.h"
+
+
+
+
+
+class cNoopFluidSimulator :
+	public cFluidSimulator
+{
+	typedef cFluidSimulator super;
+	
+public:
+	cNoopFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid) :
+		super(a_World, a_Fluid, a_StationaryFluid)
+	{
+	}
+
+	// cSimulator overrides:
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override {}
+	virtual void Simulate(float a_Dt) override {}
+} ;
+
+
+
+
diff --git a/source/World.cpp b/source/World.cpp
index a82b4078b..81aa2e6f7 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -19,6 +19,7 @@
 #include "Simulator/FloodyFluidSimulator.h"
 #include "Simulator/FluidSimulator.h"
 #include "Simulator/FireSimulator.h"
+#include "Simulator/NoopFluidSimulator.h"
 #include "Simulator/SandSimulator.h"
 #include "Simulator/RedstoneSimulator.h"
 #include "Simulator/VaporizeFluidSimulator.h"
@@ -2252,6 +2253,15 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
 	{
 		res = new cVaporizeFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock);
 	}
+	else if (
+		(NoCaseCompare(SimulatorName, "noop") == 0) ||
+		(NoCaseCompare(SimulatorName, "nop") == 0) ||
+		(NoCaseCompare(SimulatorName, "null") == 0) ||
+		(NoCaseCompare(SimulatorName, "nil") == 0)
+	)
+	{
+		res = new cNoopFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock);
+	}
 	else
 	{
 		if (NoCaseCompare(SimulatorName, "classic") != 0)