summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2017-06-19 22:28:01 +0200
committerLukas Pioch <lukas@zgow.de>2017-06-20 09:28:00 +0200
commit3d56ad01aab05048079c35d6b51ef5ed7f5aa37b (patch)
tree5e99a4e93233fbae1b4bf0392f899101a9c61203
parentGenerated tall flowers have flower type meta in both blocks (diff)
downloadcuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.tar
cuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.tar.gz
cuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.tar.bz2
cuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.tar.lz
cuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.tar.xz
cuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.tar.zst
cuberite-3d56ad01aab05048079c35d6b51ef5ed7f5aa37b.zip
Diffstat (limited to '')
-rw-r--r--src/World.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 9351dd0de..da41b22db 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -3905,15 +3905,16 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
Printf(SimulatorNameKey, "%sSimulator", a_FluidName);
AString SimulatorSectionName;
Printf(SimulatorSectionName, "%sSimulator", a_FluidName);
- AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, "Vanilla");
+
+ bool IsWater = (strcmp(a_FluidName, "Water") == 0); // Used for defaults
+ AString DefaultSimulatorName = ((GetDimension() == dimNether) && IsWater) ? "Vaporise" : "Vanilla";
+ AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, DefaultSimulatorName);
if (SimulatorName.empty())
{
- LOGWARNING("[Physics] %s not present or empty in %s, using the default of \"Vanilla\".", SimulatorNameKey.c_str(), GetIniFileName().c_str());
- SimulatorName = "Vanilla";
+ LOGWARNING("[Physics] %s not present or empty in %s, using the default of \"%s\".", SimulatorNameKey.c_str(), GetIniFileName().c_str(), DefaultSimulatorName.c_str());
+ SimulatorName = DefaultSimulatorName;
}
-
cFluidSimulator * res = nullptr;
- bool IsWater = (strcmp(a_FluidName, "Water") == 0); // Used for defaults
int Rate = 1;
if (
(NoCaseCompare(SimulatorName, "vaporize") == 0) ||