6 files changed, 16 insertions, 10 deletions

diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index ad96cfa72..05506777c 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -655,7 +655,7 @@ public:
 		g_BlockPistonBreakable[E_BLOCK_IRON_DOOR]             = true;
 		g_BlockPistonBreakable[E_BLOCK_JACK_O_LANTERN]        = true;
 		g_BlockPistonBreakable[E_BLOCK_LADDER]                = true;
-		g_BlockPistonBreakable[E_BLOCK_LAVA]                  = false;
+		g_BlockPistonBreakable[E_BLOCK_LAVA]                  = true;
 		g_BlockPistonBreakable[E_BLOCK_LEVER]                 = true;
 		g_BlockPistonBreakable[E_BLOCK_MELON]                 = true;
 		g_BlockPistonBreakable[E_BLOCK_MELON_STEM]            = true;
@@ -668,18 +668,19 @@ public:
 		g_BlockPistonBreakable[E_BLOCK_RED_ROSE]              = true;
 		g_BlockPistonBreakable[E_BLOCK_REEDS]                 = true;
 		g_BlockPistonBreakable[E_BLOCK_SNOW]                  = true;
-		g_BlockPistonBreakable[E_BLOCK_STATIONARY_LAVA]       = false;
-		g_BlockPistonBreakable[E_BLOCK_STATIONARY_WATER]      = false;  //This gave pistons the ability to drop water :D
+		g_BlockPistonBreakable[E_BLOCK_STATIONARY_LAVA]       = true;
+		g_BlockPistonBreakable[E_BLOCK_STATIONARY_WATER]      = true;
 		g_BlockPistonBreakable[E_BLOCK_STONE_BUTTON]          = true;
 		g_BlockPistonBreakable[E_BLOCK_STONE_PRESSURE_PLATE]  = true;
 		g_BlockPistonBreakable[E_BLOCK_TALL_GRASS]            = true;
 		g_BlockPistonBreakable[E_BLOCK_TORCH]                 = true;
 		g_BlockPistonBreakable[E_BLOCK_VINES]                 = true;
-		g_BlockPistonBreakable[E_BLOCK_WATER]                 = false;
+		g_BlockPistonBreakable[E_BLOCK_WATER]                 = true;
 		g_BlockPistonBreakable[E_BLOCK_WOODEN_DOOR]           = true;
 		g_BlockPistonBreakable[E_BLOCK_WOODEN_PRESSURE_PLATE] = true;
 		g_BlockPistonBreakable[E_BLOCK_YELLOW_FLOWER]         = true;
 
+
 		// Blocks that can be snowed over:
 		g_BlockIsSnowable[E_BLOCK_AIR]                   = false;
 		g_BlockIsSnowable[E_BLOCK_BROWN_MUSHROOM]        = false;
diff --git a/source/Blocks/BlockFluid.h b/source/Blocks/BlockFluid.h
index 696bfb3ce..0db2f60c4 100644
--- a/source/Blocks/BlockFluid.h
+++ b/source/Blocks/BlockFluid.h
@@ -17,6 +17,12 @@ public:
 		: cBlockHandler(a_BlockType)
 	{
 
+	}	
+	
+		
+	virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
+	{
+		// No pickups
 	}
 	
 	
diff --git a/source/Blocks/BlockIce.h b/source/Blocks/BlockIce.h
index 11fe425f3..af4961114 100644
--- a/source/Blocks/BlockIce.h
+++ b/source/Blocks/BlockIce.h
@@ -27,7 +27,7 @@ public:
 	virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override
 	{
 		// TODO: Ice destroyed with air below it should turn into air instead of water
-		a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_STATIONARY_WATER, 8);
+		a_World->FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WATER, 0);
 		// This is called later than the real destroying of this ice block
 	}	
 } ;
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index 8763e2809..0852f559e 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/source/Generating/ComposableGenerator.cpp
@@ -150,7 +150,7 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
 	AString BiomeGenName = a_IniFile.GetValueSet("Generator", "BiomeGen", "");
 	if (BiomeGenName.empty())
 	{
-		LOGWARN("[Generator]::BiomeGen value not found in world.ini, using \"MultiStepMap\".");
+		LOGWARN("[Generator] BiomeGen value not set in world.ini, using \"MultiStepMap\".");
 		BiomeGenName = "MultiStepMap";
 	}
 	
@@ -223,7 +223,7 @@ void cComposableGenerator::InitHeightGen(cIniFile & a_IniFile)
 	AString HeightGenName = a_IniFile.GetValueSet("Generator", "HeightGen", "");
 	if (HeightGenName.empty())
 	{
-		LOGWARN("[Generator]::HeightGen value not found in world.ini, using \"Biomal\".");
+		LOGWARN("[Generator] HeightGen value not set in world.ini, using \"Biomal\".");
 		HeightGenName = "Biomal";
 	}
 	
@@ -309,7 +309,7 @@ void cComposableGenerator::InitCompositionGen(cIniFile & a_IniFile)
 	AString CompoGenName = a_IniFile.GetValueSet("Generator", "CompositionGen", "");
 	if (CompoGenName.empty())
 	{
-		LOGWARN("[Generator]::CompositionGen value not found in world.ini, using \"Biomal\".");
+		LOGWARN("[Generator] CompositionGen value not set in world.ini, using \"Biomal\".");
 		CompoGenName = "Biomal";
 	}
 	if (NoCaseCompare(CompoGenName, "sameblock") == 0)
diff --git a/source/Piston.cpp b/source/Piston.cpp
index 91b1aaa93..310fcdfd4 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -1,4 +1,3 @@
-
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Piston.h"
diff --git a/source/World.cpp b/source/World.cpp
index 3955b6136..f2b353d32 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -2479,7 +2479,7 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
 	AString SimulatorName = a_IniFile.GetValueSet("Physics", SimulatorNameKey, "");
 	if (SimulatorName.empty())
 	{
-		LOGWARNING("%s [Physics]:%s not present or empty, using the default of \"Floody\".", GetIniFileName().c_str(), SimulatorNameKey.c_str());
+		LOGWARNING("[Physics] %s not present or empty in %s, using the default of \"Floody\".", SimulatorNameKey.c_str(), GetIniFileName().c_str());
 		SimulatorName = "Floody";
 	}