6 files changed, 8 insertions, 7 deletions

diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index f592b94a1..5567c1942 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -88,7 +88,7 @@ public:
 			default:
 			{
 				ASSERT(!"Unhandled block meta!");
-				return BLOCK_FACE_NONE;
+				return 0;
 			}
 		}
 	}
diff --git a/src/Blocks/BlockLever.h b/src/Blocks/BlockLever.h
index 09b600759..cb65cd03c 100644
--- a/src/Blocks/BlockLever.h
+++ b/src/Blocks/BlockLever.h
@@ -88,7 +88,7 @@ public:
 			default:
 			{
 				ASSERT(!"Unhandled block meta!");
-				return BLOCK_FACE_NONE;
+				return 0;
 			}
 		}
 	}
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h
index f549b4183..ee595d9c4 100644
--- a/src/Blocks/BlockTrapdoor.h
+++ b/src/Blocks/BlockTrapdoor.h
@@ -68,7 +68,7 @@ public:
 			default:
 			{
 				ASSERT(!"Unhandled block face!");
-				return 0x0;
+				return 0;
 			}
 		}
 	}
@@ -84,7 +84,7 @@ public:
 			default:
 			{
 				ASSERT(!"Unhandled block meta!");
-				return BLOCK_FACE_NONE;
+				return 0;
 			}
 		}
 	}
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 1e2181f32..cb10e275d 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1839,7 +1839,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
 	bbTNT.Expand(ExplosionSizeInt * 2, ExplosionSizeInt * 2, ExplosionSizeInt * 2);
 
 
-	cTNTDamageCallback TNTDamageCallback(bbTNT, Vector3d(a_BlockX, a_BlockY, a_BlockZ), a_ExplosionSize, ExplosionSizeSq);
+	cTNTDamageCallback TNTDamageCallback(bbTNT, Vector3d(a_BlockX, a_BlockY, a_BlockZ), a_ExplosionSizeInt, ExplosionSizeSq);
 	ForEachEntity(TNTDamageCallback);
 
 	// Wake up all simulators for the area, so that water and lava flows and sand falls into the blasted holes (FS #391):
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 283ef36e6..b49a8661d 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -264,7 +264,7 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
 		{
 			m_Destination.y = FindFirstNonAirBlockPosition(m_Destination.x, m_Destination.z);
 
-			if (DoesPosYRequireJump(m_Destination.y))
+			if (DoesPosYRequireJump((int)floor(m_Destination.y)))
 			{
 				m_bOnGround = false;
 				AddPosY(1.5); // Jump!!
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 04bade867..eb42e9299 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -2435,7 +2435,8 @@ void cProtocol172::cPacketizer::WriteEntityProperties(const cEntity & a_Entity)
 		WriteInt(0);
 		return;
 	}
-	const cMonster & Mob = (const cMonster &)a_Entity;
+
+	//const cMonster & Mob = (const cMonster &)a_Entity;
 
 	// TODO: Send properties and modifiers based on the mob type