4 files changed, 64 insertions, 40 deletions

diff --git a/src/Blocks/BlockMobHead.h b/src/Blocks/BlockMobHead.h
index fe4099835..34a92c150 100644
--- a/src/Blocks/BlockMobHead.h
+++ b/src/Blocks/BlockMobHead.h
@@ -30,48 +30,58 @@ public:
 			return;
 		}
 
-		class cCallback : public cMobHeadCallback
+		class cCallback : public cBlockEntityCallback
 		{
-			virtual bool Item(cMobHeadEntity * a_MobHeadEntity)
+			virtual bool Item(cBlockEntity * a_BlockEntity)
 			{
+				cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity);
+				if (MobHeadEntity == NULL)
+				{
+					return false;
+				}
+				
 				cItems Pickups;
-				Pickups.Add(E_ITEM_HEAD, 1, (short) a_MobHeadEntity->GetType());
+				Pickups.Add(E_ITEM_HEAD, 1, (short) MobHeadEntity->GetType());
 				MTRand r1;
 
 				// Mid-block position first
 				double MicroX, MicroY, MicroZ;
-				MicroX = a_MobHeadEntity->GetPosX() + 0.5;
-				MicroY = a_MobHeadEntity->GetPosY() + 0.5;
-				MicroZ = a_MobHeadEntity->GetPosZ() + 0.5;
+				MicroX = MobHeadEntity->GetPosX() + 0.5;
+				MicroY = MobHeadEntity->GetPosY() + 0.5;
+				MicroZ = MobHeadEntity->GetPosZ() + 0.5;
 
 				// Add random offset second
 				MicroX += r1.rand(1) - 0.5;
 				MicroZ += r1.rand(1) - 0.5;
 
-				a_MobHeadEntity->GetWorld()->SpawnItemPickups(Pickups, MicroX, MicroY, MicroZ);
+				MobHeadEntity->GetWorld()->SpawnItemPickups(Pickups, MicroX, MicroY, MicroZ);
 				return false;
 			}
 		} Callback;
 		
-		cWorld * World = (cWorld *) &a_WorldInterface;
-		World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ, Callback);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX, a_BlockY, a_BlockZ, Callback);
 	}
 
-	bool TrySpawnWither(cChunkInterface & a_ChunkInterface, cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ)
+	bool TrySpawnWither(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ)
 	{
 		if (a_BlockY < 2)
 		{
 			return false;
 		}
 
-		class cCallback : public cMobHeadCallback
+		class cCallback : public cBlockEntityCallback
 		{
 			bool m_IsWither;
 			
-			virtual bool Item (cMobHeadEntity * a_MobHeadEntity)
+			virtual bool Item (cBlockEntity * a_BlockEntity)
 			{
-				m_IsWither = (a_MobHeadEntity->GetType() == SKULL_TYPE_WITHER);
+				cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity);
+				if (MobHeadEntity == NULL)
+				{
+					return false;
+				}
 
+				m_IsWither = (MobHeadEntity->GetType() == SKULL_TYPE_WITHER);
 				return false;
 			}
 		
@@ -105,7 +115,7 @@ public:
 
 		} PlayerCallback(Vector3f(a_BlockX, a_BlockY, a_BlockZ));
 
-		a_World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ, CallbackA);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX, a_BlockY, a_BlockZ, CallbackA);
 
 		if (!CallbackA.IsWither())
 		{
@@ -122,8 +132,8 @@ public:
 			return false;
 		}
 		
-		a_World->DoWithMobHeadAt(a_BlockX - 1, a_BlockY, a_BlockZ, CallbackA);
-		a_World->DoWithMobHeadAt(a_BlockX + 1, a_BlockY, a_BlockZ, CallbackB);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX - 1, a_BlockY, a_BlockZ, CallbackA);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX + 1, a_BlockY, a_BlockZ, CallbackB);
 
 		BLOCKTYPE Block1 = a_ChunkInterface.GetBlock(a_BlockX - 1, a_BlockY - 1, a_BlockZ);
 		BLOCKTYPE Block2 = a_ChunkInterface.GetBlock(a_BlockX + 1, a_BlockY - 1, a_BlockZ);
@@ -136,15 +146,15 @@ public:
 			a_ChunkInterface.FastSetBlock(a_BlockX,     a_BlockY - 2, a_BlockZ, E_BLOCK_AIR, 0);
 
 			// Block entities
-			a_World->SetBlock(a_BlockX + 1, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
-			a_World->SetBlock(a_BlockX,     a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
-			a_World->SetBlock(a_BlockX - 1, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
+			a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX + 1, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
+			a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX,     a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
+			a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX - 1, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);
 
 			// Spawn the wither:
-			a_World->SpawnMob(a_BlockX + 0.5, a_BlockY - 2, a_BlockZ + 0.5, cMonster::mtWither);
+			a_WorldInterface.SpawnMob(a_BlockX + 0.5, a_BlockY - 2, a_BlockZ + 0.5, cMonster::mtWither);
 
 			// Award Achievement
-			a_World->ForEachPlayer(PlayerCallback);
+			a_WorldInterface.ForEachPlayer(PlayerCallback);
 
 			return true;
 		}
@@ -152,8 +162,8 @@ public:
 		CallbackA.Reset();
 		CallbackB.Reset();
 		
-		a_World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ - 1, CallbackA);
-		a_World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ + 1, CallbackB);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX, a_BlockY, a_BlockZ - 1, CallbackA);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX, a_BlockY, a_BlockZ + 1, CallbackB);
 
 		Block1 = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ - 1);
 		Block2 = a_ChunkInterface.GetBlock(a_BlockX, a_BlockY - 1, a_BlockZ + 1);
@@ -166,15 +176,15 @@ public:
 			a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY - 2, a_BlockZ,     E_BLOCK_AIR, 0);
 
 			// Block entities
-			a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ + 1, E_BLOCK_AIR, 0);
-			a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ,     E_BLOCK_AIR, 0);
-			a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ - 1, E_BLOCK_AIR, 0);
+			a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ + 1, E_BLOCK_AIR, 0);
+			a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ,     E_BLOCK_AIR, 0);
+			a_ChunkInterface.SetBlock(a_WorldInterface, a_BlockX, a_BlockY, a_BlockZ - 1, E_BLOCK_AIR, 0);
 
 			// Spawn the wither:
-			a_World->SpawnMob(a_BlockX + 0.5, a_BlockY - 2, a_BlockZ + 0.5, cMonster::mtWither);
+			a_WorldInterface.SpawnMob(a_BlockX + 0.5, a_BlockY - 2, a_BlockZ + 0.5, cMonster::mtWither);
 
 			// Award Achievement
-			a_World->ForEachPlayer(PlayerCallback);
+			a_WorldInterface.ForEachPlayer(PlayerCallback);
 
 			return true;
 		}
@@ -189,23 +199,29 @@ public:
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
 	) override
 	{
-		class cCallback : public cMobHeadCallback
+		class cCallback : public cBlockEntityCallback
 		{
 			cPlayer * m_Player;
 			NIBBLETYPE m_OldBlockMeta;
 			NIBBLETYPE m_NewBlockMeta;
 			
-			virtual bool Item (cMobHeadEntity * a_MobHeadEntity)
+			virtual bool Item (cBlockEntity * a_BlockEntity)
 			{
+				cMobHeadEntity * MobHeadEntity = static_cast<cMobHeadEntity*>(a_BlockEntity);
+				if (MobHeadEntity == NULL)
+				{
+					return false;
+				}
+
 				int Rotation = 0;
 				if (m_NewBlockMeta == 1)
 				{
 					Rotation = (int) floor(m_Player->GetYaw() * 16.0F / 360.0F + 0.5) & 0xF;
 				}
-				
-				a_MobHeadEntity->SetType(static_cast<eMobHeadType>(m_OldBlockMeta));
-				a_MobHeadEntity->SetRotation(static_cast<eMobHeadRotation>(Rotation));
-				a_MobHeadEntity->GetWorld()->BroadcastBlockEntity(a_MobHeadEntity->GetPosX(), a_MobHeadEntity->GetPosY(), a_MobHeadEntity->GetPosZ());
+
+				MobHeadEntity->SetType(static_cast<eMobHeadType>(m_OldBlockMeta));
+				MobHeadEntity->SetRotation(static_cast<eMobHeadRotation>(Rotation));
+				MobHeadEntity->GetWorld()->BroadcastBlockEntity(MobHeadEntity->GetPosX(), MobHeadEntity->GetPosY(), MobHeadEntity->GetPosZ());
 				return false;
 			}
 		
@@ -219,8 +235,7 @@ public:
 		cCallback Callback(a_Player, a_BlockMeta, static_cast<NIBBLETYPE>(a_BlockFace));
 		
 		a_BlockMeta = (NIBBLETYPE)a_BlockFace;
-		cWorld * World = (cWorld *) &a_WorldInterface;
-		World->DoWithMobHeadAt(a_BlockX, a_BlockY, a_BlockZ, Callback);
+		a_WorldInterface.DoWithBlockEntityAt(a_BlockX, a_BlockY, a_BlockZ, Callback);
 		a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, a_BlockMeta);
 
 		if (a_BlockMeta == SKULL_TYPE_WITHER)
@@ -235,7 +250,7 @@ public:
 			};
 			for (size_t i = 0; i < ARRAYCOUNT(Coords); ++i)
 			{
-				if (TrySpawnWither(a_ChunkInterface, World, a_BlockX + Coords[i].x, a_BlockY, a_BlockZ + Coords[i].z))
+				if (TrySpawnWither(a_ChunkInterface, a_WorldInterface, a_BlockX + Coords[i].x, a_BlockY, a_BlockZ + Coords[i].z))
 				{
 					break;
 				}
diff --git a/src/Blocks/WorldInterface.h b/src/Blocks/WorldInterface.h
index bfbb053d9..650a216c0 100644
--- a/src/Blocks/WorldInterface.h
+++ b/src/Blocks/WorldInterface.h
@@ -6,6 +6,12 @@
 
 class cItems;
 
+typedef cItemCallback<cBlockEntity> cBlockEntityCallback;
+
+
+
+
+
 class cWorldInterface
 {
 public:
@@ -29,6 +35,9 @@ public:
 	/** Spawns a mob of the specified type. Returns the mob's EntityID if recognized and spawned, <0 otherwise */
 	virtual int SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eType a_MonsterType) = 0;
 
+	/** Calls the callback for the block entity at the specified coords; returns false if there's no block entity at those coords, true if found */
+	virtual bool DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBlockEntityCallback & a_Callback) = 0;
+
 	/** Sends the block on those coords to the player */
 	virtual void SendBlockTo(int a_BlockX, int a_BlockY, int a_BlockZ, cPlayer * a_Player) = 0;
 
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 9d973f2a9..adcf687c0 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -34,8 +34,8 @@ class cBlockArea;
 class cMobCensus;
 class cMobSpawner;
 
-typedef std::list<cClientHandle *>  cClientHandleList;
-typedef cChunk * cChunkPtr;
+typedef std::list<cClientHandle *>         cClientHandleList;
+typedef cChunk *                           cChunkPtr;
 typedef cItemCallback<cEntity>             cEntityCallback;
 typedef cItemCallback<cBlockEntity>        cBlockEntityCallback;
 typedef cItemCallback<cChestEntity>        cChestCallback;
diff --git a/src/World.h b/src/World.h
index 86cbb3e7e..cd465bece 100644
--- a/src/World.h
+++ b/src/World.h
@@ -511,7 +511,7 @@ public:
 	virtual void DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_BlockY, double a_BlockZ, bool a_CanCauseFire, eExplosionSource a_Source, void * a_SourceData) override;  // tolua_export
 
 	/** Calls the callback for the block entity at the specified coords; returns false if there's no block entity at those coords, true if found */
-	bool DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBlockEntityCallback & a_Callback);  // Exported in ManualBindings.cpp
+	virtual bool DoWithBlockEntityAt(int a_BlockX, int a_BlockY, int a_BlockZ, cBlockEntityCallback & a_Callback) override;  // Exported in ManualBindings.cpp
 
 	/** Calls the callback for the chest at the specified coords; returns false if there's no chest at those coords, true if found */
 	bool DoWithChestAt(int a_BlockX, int a_BlockY, int a_BlockZ, cChestCallback & a_Callback);  // Exported in ManualBindings.cpp