From 3d94a7ea560f00585f454476928ba4ba3ec28ef7 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 17 Sep 2014 17:45:13 +0200
Subject: Created MobSpawnerEntity class.

---
 src/BlockEntities/BlockEntity.h        |  2 +-
 src/BlockEntities/CMakeLists.txt       |  2 +
 src/BlockEntities/MobSpawnerEntity.cpp | 92 ++++++++++++++++++++++++++++++++++
 src/BlockEntities/MobSpawnerEntity.h   | 70 ++++++++++++++++++++++++++
 4 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 src/BlockEntities/MobSpawnerEntity.cpp
 create mode 100644 src/BlockEntities/MobSpawnerEntity.h

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h
index 5710f8543..e9d3a00ae 100644
--- a/src/BlockEntities/BlockEntity.h
+++ b/src/BlockEntities/BlockEntity.h
@@ -87,7 +87,7 @@ public:
 	virtual void SendTo(cClientHandle & a_Client) = 0;
 	
 	/// Ticks the entity; returns true if the chunk should be marked as dirty as a result of this ticking. By default does nothing.
-	virtual bool Tick(float a_Dt, cChunk & /* a_Chunk */)
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk)
 	{
 		UNUSED(a_Dt);
 		return false;
diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt
index d87594b0d..5f4af288d 100644
--- a/src/BlockEntities/CMakeLists.txt
+++ b/src/BlockEntities/CMakeLists.txt
@@ -18,6 +18,7 @@ SET (SRCS
 	HopperEntity.cpp
 	JukeboxEntity.cpp
 	MobHeadEntity.cpp
+	MobSpawnerEntity.cpp
 	NoteEntity.cpp
 	SignEntity.cpp)
 
@@ -36,6 +37,7 @@ SET (HDRS
 	HopperEntity.h
 	JukeboxEntity.h
 	MobHeadEntity.h
+	MobSpawnerEntity.h
 	NoteEntity.h
 	SignEntity.h)
 
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
new file mode 100644
index 000000000..1db1aad9b
--- /dev/null
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -0,0 +1,92 @@
+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "MobSpawnerEntity.h"
+#include "../World.h"
+#include "json/json.h"
+
+
+
+
+
+cMobSpawnerEntity::cMobSpawnerEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)
+	: super(E_BLOCK_MOB_SPAWNER, a_BlockX, a_BlockY, a_BlockZ, a_World)
+	, m_EntityName("Pig")
+	, m_SpawnDelay(20)
+	, m_MinSpawnDelay(200)
+	, m_MaxSpawnDelay(800)
+	, m_MaxNearbyEntities(6)
+	, m_ActivatingRange(16)
+	, m_SpawnRange(4)
+{
+}
+
+
+
+
+
+cMobSpawnerEntity::~cMobSpawnerEntity()
+{
+	
+}
+
+
+
+
+
+bool cMobSpawnerEntity::Tick(float a_Dt, cChunk & a_Chunk)
+{
+	
+}
+
+
+
+
+
+void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
+{
+	if (IsPlayingRecord())
+	{
+		EjectRecord();
+	}
+	else
+	{
+		const cItem & HeldItem = a_Player->GetEquippedItem();
+		if (PlayRecord(HeldItem.m_ItemType))
+		{
+			a_Player->GetInventory().RemoveOneEquippedItem();
+		}
+	}
+}
+
+
+
+
+
+bool cMobSpawnerEntity::LoadFromJson(const Json::Value & a_Value)
+{
+	m_PosX = a_Value.get("x", 0).asInt();
+	m_PosY = a_Value.get("y", 0).asInt();
+	m_PosZ = a_Value.get("z", 0).asInt();
+
+	m_Record = a_Value.get("Record", 0).asInt();
+
+	return true;
+}
+
+
+
+
+
+void cMobSpawnerEntity::SaveToJson(Json::Value & a_Value)
+{
+	a_Value["x"] = m_PosX;
+	a_Value["y"] = m_PosY;
+	a_Value["z"] = m_PosZ;
+
+	a_Value["Record"] = m_Record;
+}
+
+
+
+
diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h
new file mode 100644
index 000000000..b173214a5
--- /dev/null
+++ b/src/BlockEntities/MobSpawnerEntity.h
@@ -0,0 +1,70 @@
+
+#pragma once
+
+#include "BlockEntity.h"
+#include "../Entities/Player.h"
+
+
+
+
+
+namespace Json
+{
+	class Value;
+}
+
+
+
+
+
+// tolua_begin
+
+class cMobSpawnerEntity :
+	public cBlockEntity
+{
+	typedef cBlockEntity super;
+public:
+
+	// tolua_end
+	
+	cMobSpawnerEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
+	virtual ~cMobSpawnerEntity();
+
+	bool LoadFromJson(const Json::Value & a_Value);
+	virtual void SaveToJson(Json::Value & a_Value) override;
+
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+
+	// tolua_begin
+
+	/** Returns the entity who will be spawn by this mob spawner. */
+	const AString & GetEntityName(void) const { return m_EntityName; }
+
+	// tolua_end
+
+	static const char * GetClassStatic(void) { return "cMobSpawnerEntity"; }
+	
+	virtual void UsedBy(cPlayer * a_Player) override;
+	virtual void SendTo(cClientHandle &) override {}
+
+private:
+	/** The entity to spawn. */
+	AString m_EntityName;
+
+	int m_SpawnDelay;
+	int m_MinSpawnDelay;
+	int m_MaxSpawnDelay;
+
+	/** The mob spawner spawns only mobs when the count of nearby entities (without players) is lesser than this number. */
+	short m_MaxNearbyEntities;
+
+	/** The mob spawner spawns only mobs when a player is in the range of the mob spawner. */
+	short m_ActivatingRange;
+
+	/** The range coefficient for spawning entities around. */
+	short m_SpawnRange;
+} ;  // tolua_end
+
+
+
+
-- 
cgit v1.2.3


From 718eb227abe3b9a0e5277d663e32c6e10d51ab52 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Fri, 19 Sep 2014 23:00:54 +0200
Subject: Implemented mob spawner.

---
 src/BlockEntities/BlockEntity.cpp      |   6 +-
 src/BlockEntities/MobSpawnerEntity.cpp | 310 ++++++++++++++++++++++++++++++---
 src/BlockEntities/MobSpawnerEntity.h   |  50 +++---
 3 files changed, 323 insertions(+), 43 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BlockEntity.cpp b/src/BlockEntities/BlockEntity.cpp
index 05ad03a3d..a969f493e 100644
--- a/src/BlockEntities/BlockEntity.cpp
+++ b/src/BlockEntities/BlockEntity.cpp
@@ -14,10 +14,11 @@
 #include "FlowerPotEntity.h"
 #include "FurnaceEntity.h"
 #include "HopperEntity.h"
+#include "MobHeadEntity.h"
+#include "MobSpawnerEntity.h"
 #include "JukeboxEntity.h"
 #include "NoteEntity.h"
 #include "SignEntity.h"
-#include "MobHeadEntity.h"
 
 
 
@@ -35,8 +36,9 @@ cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE
 		case E_BLOCK_ENDER_CHEST:   return new cEnderChestEntity  (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_FLOWER_POT:    return new cFlowerPotEntity   (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_FURNACE:       return new cFurnaceEntity     (a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_World);
-		case E_BLOCK_HEAD:          return new cMobHeadEntity     (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_HOPPER:        return new cHopperEntity      (a_BlockX, a_BlockY, a_BlockZ, a_World);
+		case E_BLOCK_HEAD:          return new cMobHeadEntity     (a_BlockX, a_BlockY, a_BlockZ, a_World);
+		case E_BLOCK_MOB_SPAWNER:   return new cMobSpawnerEntity  (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_JUKEBOX:       return new cJukeboxEntity     (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_LIT_FURNACE:   return new cFurnaceEntity     (a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_World);
 		case E_BLOCK_SIGN_POST:     return new cSignEntity        (a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World);
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 1db1aad9b..2b963c3f9 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -2,22 +2,22 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "MobSpawnerEntity.h"
-#include "../World.h"
 #include "json/json.h"
 
+#include "../World.h"
+#include "../FastRandom.h"
+#include "../MobSpawner.h"
+#include "../Items/ItemSpawnEgg.h"
+
 
 
 
 
 cMobSpawnerEntity::cMobSpawnerEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)
 	: super(E_BLOCK_MOB_SPAWNER, a_BlockX, a_BlockY, a_BlockZ, a_World)
-	, m_EntityName("Pig")
-	, m_SpawnDelay(20)
-	, m_MinSpawnDelay(200)
-	, m_MaxSpawnDelay(800)
-	, m_MaxNearbyEntities(6)
-	, m_ActivatingRange(16)
-	, m_SpawnRange(4)
+	, m_Entity(cMonster::mtPig)
+	, m_SpawnDelay(100)
+	, m_IsActive(false)
 {
 }
 
@@ -25,37 +25,170 @@ cMobSpawnerEntity::cMobSpawnerEntity(int a_BlockX, int a_BlockY, int a_BlockZ, c
 
 
 
-cMobSpawnerEntity::~cMobSpawnerEntity()
+void cMobSpawnerEntity::SendTo(cClientHandle & a_Client)
 {
-	
+	a_Client.SendUpdateBlockEntity(*this);
 }
 
 
 
 
 
-bool cMobSpawnerEntity::Tick(float a_Dt, cChunk & a_Chunk)
+void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
+{
+	if (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SPAWN_EGG)
+	{
+		cMonster::eType MonsterType = cItemSpawnEggHandler::ItemDamageToMonsterType(a_Player->GetEquippedItem().m_ItemDamage);
+		if (MonsterType == cMonster::mtInvalidType)
+		{
+			return;
+		}
+
+		m_Entity = MonsterType;
+		ResetTimer();
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->GetInventory().RemoveOneEquippedItem();
+		}
+		LOGD("Changed monster spawner entity to %s!", GetEntityName().c_str());
+	}
+}
+
+
+
+
+
+void cMobSpawnerEntity::UpdateActiveState(void)
 {
-	
+	if (GetNearbyPlayersNum() > 0)
+	{
+		m_IsActive = true;
+	}
+	else
+	{
+		m_IsActive = false;
+	}
 }
 
 
 
 
 
-void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
+bool cMobSpawnerEntity::Tick(float a_Dt, cChunk & a_Chunk)
 {
-	if (IsPlayingRecord())
+	// Update the active flag every 5 seconds
+	if ((m_World->GetWorldAge() % 100) == 0)
+	{
+		UpdateActiveState();
+	}
+
+	if (!m_IsActive)
+	{
+		return false;
+	}
+
+	if (m_SpawnDelay <= 0)
 	{
-		EjectRecord();
+		SpawnEntity();
+		return true;
 	}
 	else
 	{
-		const cItem & HeldItem = a_Player->GetEquippedItem();
-		if (PlayRecord(HeldItem.m_ItemType))
+		m_SpawnDelay--;
+	}
+	return false;
+}
+
+
+
+
+
+void cMobSpawnerEntity::ResetTimer(void)
+{
+	m_SpawnDelay = 200 + m_World->GetTickRandomNumber(600);
+	m_World->BroadcastBlockEntity(m_PosX, m_PosY, m_PosZ);
+}
+
+
+
+
+
+void cMobSpawnerEntity::SpawnEntity(void)
+{
+	int NearbyEntities = GetNearbyEntityNum(m_Entity);
+	if (NearbyEntities >= 6)
+	{
+		ResetTimer();
+		return;
+	}
+
+	class cCallback : public cChunkCallback
+	{
+	public:
+		cCallback(int a_RelX, int a_RelY, int a_RelZ, cMonster::eType a_MobType, int a_NearbyEntitiesNum) :
+			m_RelX(a_RelX),
+			m_RelY(a_RelY),
+			m_RelZ(a_RelZ),
+			m_MobType(a_MobType),
+			m_NearbyEntitiesNum(a_NearbyEntitiesNum)
 		{
-			a_Player->GetInventory().RemoveOneEquippedItem();
 		}
+
+		virtual bool Item(cChunk * a_Chunk)
+		{
+			cFastRandom Random;
+
+			bool EntitiesSpawned = false;
+			for (size_t i = 0; i < 4; i++)
+			{
+				if (m_NearbyEntitiesNum >= 6)
+				{
+					break;
+				}
+
+				int RelX = (int) (m_RelX + (double)(Random.NextFloat() - Random.NextFloat()) * 4.0);
+				int RelY = m_RelY + Random.NextInt(3) - 1;
+				int RelZ = (int) (m_RelZ + (double)(Random.NextFloat() - Random.NextFloat()) * 4.0);
+
+				cChunk * Chunk = a_Chunk->GetRelNeighborChunkAdjustCoords(RelX, RelZ);
+				if ((Chunk == NULL) || !Chunk->IsValid())
+				{
+					continue;
+				}
+				EMCSBiome Biome = Chunk->GetBiomeAt(RelX, RelZ);
+
+				if (cMobSpawner::CanSpawnHere(Chunk, RelX, RelY, RelZ, m_MobType, Biome))
+				{
+					double PosX = Chunk->GetPosX() * cChunkDef::Width + RelX;
+					double PosZ = Chunk->GetPosZ() * cChunkDef::Width + RelZ;
+
+					cMonster * Monster = cMonster::NewMonsterFromType(m_MobType);
+					if (Monster == NULL)
+					{
+						continue;
+					}
+
+					Monster->SetPosition(PosX, RelY, PosZ);
+					Monster->SetYaw(Random.NextFloat() * 360.0f);
+					if (Chunk->GetWorld()->SpawnMobFinalize(Monster) != cMonster::mtInvalidType)
+					{
+						EntitiesSpawned = true;
+						Chunk->BroadcastSoundParticleEffect(2004, (int)(PosX * 8.0), (int)(RelY * 8.0), (int)(PosZ * 8.0), 0);
+						m_NearbyEntitiesNum++;
+					}
+				}
+			}
+			return EntitiesSpawned;
+		}
+	protected:
+		int m_RelX, m_RelY, m_RelZ;
+		cMonster::eType m_MobType;
+		int m_NearbyEntitiesNum;
+	} Callback(m_RelX, m_PosY, m_RelZ, m_Entity, NearbyEntities);
+
+	if (m_World->DoWithChunk(GetChunkX(), GetChunkZ(), Callback))
+	{
+		ResetTimer();
 	}
 }
 
@@ -69,8 +202,6 @@ bool cMobSpawnerEntity::LoadFromJson(const Json::Value & a_Value)
 	m_PosY = a_Value.get("y", 0).asInt();
 	m_PosZ = a_Value.get("z", 0).asInt();
 
-	m_Record = a_Value.get("Record", 0).asInt();
-
 	return true;
 }
 
@@ -83,8 +214,145 @@ void cMobSpawnerEntity::SaveToJson(Json::Value & a_Value)
 	a_Value["x"] = m_PosX;
 	a_Value["y"] = m_PosY;
 	a_Value["z"] = m_PosZ;
+}
+
+
+
+
+
+AString cMobSpawnerEntity::GetEntityName() const
+{
+	switch (m_Entity)
+	{
+		case cMonster::mtBat:          return "Bat";
+		case cMonster::mtBlaze:        return "Blaze";
+		case cMonster::mtCaveSpider:   return "CaveSpider";
+		case cMonster::mtChicken:      return "Chicken";
+		case cMonster::mtCow:          return "Cow";
+		case cMonster::mtCreeper:      return "Creeper";
+		case cMonster::mtEnderDragon:  return "EnderDragon";
+		case cMonster::mtEnderman:     return "Enderman";
+		case cMonster::mtGhast:        return "Ghast";
+		case cMonster::mtGiant:        return "Giant";
+		case cMonster::mtHorse:        return "EntityHorse";
+		case cMonster::mtIronGolem:    return "VillagerGolem";
+		case cMonster::mtMagmaCube:    return "LavaSlime";
+		case cMonster::mtMooshroom:    return "MushroomCow";
+		case cMonster::mtOcelot:       return "Ozelot";
+		case cMonster::mtPig:          return "Pig";
+		case cMonster::mtSheep:        return "Sheep";
+		case cMonster::mtSilverfish:   return "Silverfish";
+		case cMonster::mtSkeleton:     return "Skeleton";
+		case cMonster::mtSlime:        return "Slime";
+		case cMonster::mtSnowGolem:    return "SnowMan";
+		case cMonster::mtSpider:       return "Spider";
+		case cMonster::mtSquid:        return "Squid";
+		case cMonster::mtVillager:     return "Villager";
+		case cMonster::mtWitch:        return "Witch";
+		case cMonster::mtWither:       return "WitherBoss";
+		case cMonster::mtWolf:         return "Wolf";
+		case cMonster::mtZombie:       return "Zombie";
+		case cMonster::mtZombiePigman: return "PigZombie";
+		default:
+		{
+			ASSERT(!"Unknown monster type!");
+			return "Pig";
+		}
+	}
+}
+
+
+
+
+
+int cMobSpawnerEntity::GetNearbyPlayersNum(void)
+{
+	Vector3d SpawnerPos(m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5);
+	int NumPlayers = 0;
+
+	class cCallback : public cChunkDataCallback
+	{
+	public:
+		cCallback(Vector3d a_SpawnerPos, int & a_NumPlayers) :
+			m_SpawnerPos(a_SpawnerPos),
+			m_NumPlayers(a_NumPlayers)
+		{
+		}
+
+		virtual void Entity(cEntity * a_Entity) override
+		{
+			if (!a_Entity->IsPlayer())
+			{
+				return;
+			}
+
+			if ((m_SpawnerPos - a_Entity->GetPosition()).Length() <= 16)
+			{
+				m_NumPlayers++;
+			}
+		}
+
+	protected:
+		Vector3d m_SpawnerPos;
+		int & m_NumPlayers;
+	} Callback(SpawnerPos, NumPlayers);
+
+	int ChunkX = GetChunkX();
+	int ChunkZ = GetChunkZ();
+	m_World->ForEachChunkInRect(ChunkX - 1, ChunkX + 1, ChunkZ - 1, ChunkZ + 1, Callback);
+
+	return NumPlayers;
+}
+
+
+
+
+
+int cMobSpawnerEntity::GetNearbyEntityNum(cMonster::eType a_EntityType)
+{
+	Vector3d SpawnerPos(m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5);
+	int NumEntities = 0;
+
+	class cCallback : public cChunkDataCallback
+	{
+	public:
+		cCallback(Vector3d a_SpawnerPos, cMonster::eType a_EntityType, int & a_NumEntities) :
+			m_SpawnerPos(a_SpawnerPos),
+			m_EntityType(a_EntityType),
+			m_NumEntities(a_NumEntities)
+		{
+		}
+
+		virtual void Entity(cEntity * a_Entity) override
+		{
+			if (!a_Entity->IsMob())
+			{
+				return;
+			}
+
+			cMonster * Mob = (cMonster *)a_Entity;
+			if (Mob->GetMobType() != m_EntityType)
+			{
+				return;
+			}
+
+			if (((m_SpawnerPos - a_Entity->GetPosition()).Length() <= 8) && (Diff(m_SpawnerPos.y, a_Entity->GetPosY()) <= 4.0))
+			{
+				m_NumEntities++;
+			}
+		}
+
+	protected:
+		Vector3d m_SpawnerPos;
+		cMonster::eType m_EntityType;
+		int & m_NumEntities;
+	} Callback(SpawnerPos, a_EntityType, NumEntities);
+
+	int ChunkX = GetChunkX();
+	int ChunkZ = GetChunkZ();
+	m_World->ForEachChunkInRect(ChunkX - 1, ChunkX + 1, ChunkZ - 1, ChunkZ + 1, Callback);
 
-	a_Value["Record"] = m_Record;
+	return NumEntities;
 }
 
 
diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h
index b173214a5..b12a97d65 100644
--- a/src/BlockEntities/MobSpawnerEntity.h
+++ b/src/BlockEntities/MobSpawnerEntity.h
@@ -28,41 +28,51 @@ public:
 	// tolua_end
 	
 	cMobSpawnerEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
-	virtual ~cMobSpawnerEntity();
-
-	bool LoadFromJson(const Json::Value & a_Value);
-	virtual void SaveToJson(Json::Value & a_Value) override;
 
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
 	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
 
 	// tolua_begin
 
-	/** Returns the entity who will be spawn by this mob spawner. */
-	const AString & GetEntityName(void) const { return m_EntityName; }
+	/** Upate the active flag from the mob spawner. This function will called every 5 seconds from the Tick() function. */
+	void UpdateActiveState(void);
+
+	/** Sets the spawn delay to a new random value. */
+	void ResetTimer(void);
+
+	/** Spawns the entity. This function automaticly change the spawn delay! */
+	void SpawnEntity(void);
+
+	/** Returns the entity type who will be spawn by this mob spawner. */
+	cMonster::eType GetEntity(void) const { return m_Entity; }
+
+	/** Sets the entity type who will be spawn by this mob spawner. */
+	void SetEntity(cMonster::eType a_EntityType) { m_Entity = a_EntityType; }
+
+	/** Returns the entity name. (Required by the protocol) */
+	AString GetEntityName(void) const;
+
+	/** Returns the spawn delay. */
+	int GetSpawnDelay(void) const { return m_SpawnDelay; }
+
+	int GetNearbyPlayersNum(void);
+	int GetNearbyEntityNum(cMonster::eType a_EntityType);
 
 	// tolua_end
 
+	bool LoadFromJson(const Json::Value & a_Value);
+	virtual void SaveToJson(Json::Value & a_Value) override;
+
 	static const char * GetClassStatic(void) { return "cMobSpawnerEntity"; }
-	
-	virtual void UsedBy(cPlayer * a_Player) override;
-	virtual void SendTo(cClientHandle &) override {}
 
 private:
 	/** The entity to spawn. */
-	AString m_EntityName;
+	cMonster::eType m_Entity;
 
 	int m_SpawnDelay;
-	int m_MinSpawnDelay;
-	int m_MaxSpawnDelay;
-
-	/** The mob spawner spawns only mobs when the count of nearby entities (without players) is lesser than this number. */
-	short m_MaxNearbyEntities;
-
-	/** The mob spawner spawns only mobs when a player is in the range of the mob spawner. */
-	short m_ActivatingRange;
 
-	/** The range coefficient for spawning entities around. */
-	short m_SpawnRange;
+	bool m_IsActive;
 } ;  // tolua_end
 
 
-- 
cgit v1.2.3


From 5e71d5299c9cc8c80166ab202f376ffb086a2fa7 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 27 Sep 2014 00:07:17 +0200
Subject: Fixed compile errors.

---
 src/BlockEntities/MobSpawnerEntity.cpp | 76 +++++++++++++++++-----------------
 src/BlockEntities/MobSpawnerEntity.h   |  8 ++--
 2 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 2b963c3f9..0d14ad647 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -15,7 +15,7 @@
 
 cMobSpawnerEntity::cMobSpawnerEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)
 	: super(E_BLOCK_MOB_SPAWNER, a_BlockX, a_BlockY, a_BlockZ, a_World)
-	, m_Entity(cMonster::mtPig)
+	, m_Entity(mtPig)
 	, m_SpawnDelay(100)
 	, m_IsActive(false)
 {
@@ -39,7 +39,7 @@ void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
 	if (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SPAWN_EGG)
 	{
 		cMonster::eType MonsterType = cItemSpawnEggHandler::ItemDamageToMonsterType(a_Player->GetEquippedItem().m_ItemDamage);
-		if (MonsterType == cMonster::mtInvalidType)
+		if (MonsterType == mtInvalidType)
 		{
 			return;
 		}
@@ -115,7 +115,7 @@ void cMobSpawnerEntity::ResetTimer(void)
 
 void cMobSpawnerEntity::SpawnEntity(void)
 {
-	int NearbyEntities = GetNearbyEntityNum(m_Entity);
+	int NearbyEntities = GetNearbyMonsterNum(m_Entity);
 	if (NearbyEntities >= 6)
 	{
 		ResetTimer();
@@ -125,7 +125,7 @@ void cMobSpawnerEntity::SpawnEntity(void)
 	class cCallback : public cChunkCallback
 	{
 	public:
-		cCallback(int a_RelX, int a_RelY, int a_RelZ, cMonster::eType a_MobType, int a_NearbyEntitiesNum) :
+		cCallback(int a_RelX, int a_RelY, int a_RelZ, eMonsterType a_MobType, int a_NearbyEntitiesNum) :
 			m_RelX(a_RelX),
 			m_RelY(a_RelY),
 			m_RelZ(a_RelZ),
@@ -170,7 +170,7 @@ void cMobSpawnerEntity::SpawnEntity(void)
 
 					Monster->SetPosition(PosX, RelY, PosZ);
 					Monster->SetYaw(Random.NextFloat() * 360.0f);
-					if (Chunk->GetWorld()->SpawnMobFinalize(Monster) != cMonster::mtInvalidType)
+					if (Chunk->GetWorld()->SpawnMobFinalize(Monster) != mtInvalidType)
 					{
 						EntitiesSpawned = true;
 						Chunk->BroadcastSoundParticleEffect(2004, (int)(PosX * 8.0), (int)(RelY * 8.0), (int)(PosZ * 8.0), 0);
@@ -182,7 +182,7 @@ void cMobSpawnerEntity::SpawnEntity(void)
 		}
 	protected:
 		int m_RelX, m_RelY, m_RelZ;
-		cMonster::eType m_MobType;
+		eMonsterType m_MobType;
 		int m_NearbyEntitiesNum;
 	} Callback(m_RelX, m_PosY, m_RelZ, m_Entity, NearbyEntities);
 
@@ -224,35 +224,35 @@ AString cMobSpawnerEntity::GetEntityName() const
 {
 	switch (m_Entity)
 	{
-		case cMonster::mtBat:          return "Bat";
-		case cMonster::mtBlaze:        return "Blaze";
-		case cMonster::mtCaveSpider:   return "CaveSpider";
-		case cMonster::mtChicken:      return "Chicken";
-		case cMonster::mtCow:          return "Cow";
-		case cMonster::mtCreeper:      return "Creeper";
-		case cMonster::mtEnderDragon:  return "EnderDragon";
-		case cMonster::mtEnderman:     return "Enderman";
-		case cMonster::mtGhast:        return "Ghast";
-		case cMonster::mtGiant:        return "Giant";
-		case cMonster::mtHorse:        return "EntityHorse";
-		case cMonster::mtIronGolem:    return "VillagerGolem";
-		case cMonster::mtMagmaCube:    return "LavaSlime";
-		case cMonster::mtMooshroom:    return "MushroomCow";
-		case cMonster::mtOcelot:       return "Ozelot";
-		case cMonster::mtPig:          return "Pig";
-		case cMonster::mtSheep:        return "Sheep";
-		case cMonster::mtSilverfish:   return "Silverfish";
-		case cMonster::mtSkeleton:     return "Skeleton";
-		case cMonster::mtSlime:        return "Slime";
-		case cMonster::mtSnowGolem:    return "SnowMan";
-		case cMonster::mtSpider:       return "Spider";
-		case cMonster::mtSquid:        return "Squid";
-		case cMonster::mtVillager:     return "Villager";
-		case cMonster::mtWitch:        return "Witch";
-		case cMonster::mtWither:       return "WitherBoss";
-		case cMonster::mtWolf:         return "Wolf";
-		case cMonster::mtZombie:       return "Zombie";
-		case cMonster::mtZombiePigman: return "PigZombie";
+		case mtBat:          return "Bat";
+		case mtBlaze:        return "Blaze";
+		case mtCaveSpider:   return "CaveSpider";
+		case mtChicken:      return "Chicken";
+		case mtCow:          return "Cow";
+		case mtCreeper:      return "Creeper";
+		case mtEnderDragon:  return "EnderDragon";
+		case mtEnderman:     return "Enderman";
+		case mtGhast:        return "Ghast";
+		case mtGiant:        return "Giant";
+		case mtHorse:        return "EntityHorse";
+		case mtIronGolem:    return "VillagerGolem";
+		case mtMagmaCube:    return "LavaSlime";
+		case mtMooshroom:    return "MushroomCow";
+		case mtOcelot:       return "Ozelot";
+		case mtPig:          return "Pig";
+		case mtSheep:        return "Sheep";
+		case mtSilverfish:   return "Silverfish";
+		case mtSkeleton:     return "Skeleton";
+		case mtSlime:        return "Slime";
+		case mtSnowGolem:    return "SnowMan";
+		case mtSpider:       return "Spider";
+		case mtSquid:        return "Squid";
+		case mtVillager:     return "Villager";
+		case mtWitch:        return "Witch";
+		case mtWither:       return "WitherBoss";
+		case mtWolf:         return "Wolf";
+		case mtZombie:       return "Zombie";
+		case mtZombiePigman: return "PigZombie";
 		default:
 		{
 			ASSERT(!"Unknown monster type!");
@@ -308,7 +308,7 @@ int cMobSpawnerEntity::GetNearbyPlayersNum(void)
 
 
 
-int cMobSpawnerEntity::GetNearbyEntityNum(cMonster::eType a_EntityType)
+int cMobSpawnerEntity::GetNearbyMonsterNum(eMonsterType a_EntityType)
 {
 	Vector3d SpawnerPos(m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5);
 	int NumEntities = 0;
@@ -316,7 +316,7 @@ int cMobSpawnerEntity::GetNearbyEntityNum(cMonster::eType a_EntityType)
 	class cCallback : public cChunkDataCallback
 	{
 	public:
-		cCallback(Vector3d a_SpawnerPos, cMonster::eType a_EntityType, int & a_NumEntities) :
+		cCallback(Vector3d a_SpawnerPos, eMonsterType a_EntityType, int & a_NumEntities) :
 			m_SpawnerPos(a_SpawnerPos),
 			m_EntityType(a_EntityType),
 			m_NumEntities(a_NumEntities)
@@ -344,7 +344,7 @@ int cMobSpawnerEntity::GetNearbyEntityNum(cMonster::eType a_EntityType)
 
 	protected:
 		Vector3d m_SpawnerPos;
-		cMonster::eType m_EntityType;
+		eMonsterType m_EntityType;
 		int & m_NumEntities;
 	} Callback(SpawnerPos, a_EntityType, NumEntities);
 
diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h
index b12a97d65..7fec2699c 100644
--- a/src/BlockEntities/MobSpawnerEntity.h
+++ b/src/BlockEntities/MobSpawnerEntity.h
@@ -45,10 +45,10 @@ public:
 	void SpawnEntity(void);
 
 	/** Returns the entity type who will be spawn by this mob spawner. */
-	cMonster::eType GetEntity(void) const { return m_Entity; }
+	eMonsterType GetEntity(void) const { return m_Entity; }
 
 	/** Sets the entity type who will be spawn by this mob spawner. */
-	void SetEntity(cMonster::eType a_EntityType) { m_Entity = a_EntityType; }
+	void SetEntity(eMonsterType a_EntityType) { m_Entity = a_EntityType; }
 
 	/** Returns the entity name. (Required by the protocol) */
 	AString GetEntityName(void) const;
@@ -57,7 +57,7 @@ public:
 	int GetSpawnDelay(void) const { return m_SpawnDelay; }
 
 	int GetNearbyPlayersNum(void);
-	int GetNearbyEntityNum(cMonster::eType a_EntityType);
+	int GetNearbyMonsterNum(eMonsterType a_EntityType);
 
 	// tolua_end
 
@@ -68,7 +68,7 @@ public:
 
 private:
 	/** The entity to spawn. */
-	cMonster::eType m_Entity;
+	eMonsterType m_Entity;
 
 	int m_SpawnDelay;
 
-- 
cgit v1.2.3


From 8b028c5c78e53c149dfa8b3e7ec878f7f0428f1d Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Tue, 18 Nov 2014 15:33:41 +0100
Subject: Finished mob spawner implementation.

---
 src/BlockEntities/BeaconEntity.h       | 10 +---------
 src/BlockEntities/BlockEntity.h        |  5 -----
 src/BlockEntities/ChestEntity.h        |  5 -----
 src/BlockEntities/CommandBlockEntity.h |  8 --------
 src/BlockEntities/DropSpenserEntity.h  |  4 ----
 src/BlockEntities/FlowerPotEntity.h    | 10 ----------
 src/BlockEntities/FurnaceEntity.h      |  5 -----
 src/BlockEntities/JukeboxEntity.h      |  9 ---------
 src/BlockEntities/MobHeadEntity.h      |  8 --------
 src/BlockEntities/MobSpawnerEntity.cpp | 33 ++++-----------------------------
 src/BlockEntities/MobSpawnerEntity.h   | 19 +++++--------------
 src/BlockEntities/NoteEntity.h         |  6 ------
 src/BlockEntities/SignEntity.h         |  9 ---------
 13 files changed, 10 insertions(+), 121 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h
index d1db3a68f..783e04fe2 100644
--- a/src/BlockEntities/BeaconEntity.h
+++ b/src/BlockEntities/BeaconEntity.h
@@ -1,3 +1,4 @@
+
 // BeaconEntity.h
 
 // Declares the cBeaconEntity class representing a single beacon in the world
@@ -14,15 +15,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 // tolua_begin
 class cBeaconEntity :
 	public cBlockEntityWithItems
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h
index c778e97bc..056a88721 100644
--- a/src/BlockEntities/BlockEntity.h
+++ b/src/BlockEntities/BlockEntity.h
@@ -28,11 +28,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-};
-
 class cChunk;
 class cPlayer;
 class cWorld;
diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h
index 09fffb923..a8a765430 100644
--- a/src/BlockEntities/ChestEntity.h
+++ b/src/BlockEntities/ChestEntity.h
@@ -7,11 +7,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-};
-
 class cClientHandle;
 
 
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 217390293..8b5a2b87f 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -15,14 +15,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
-
-
-
 
 // tolua_begin
 
diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h
index f77a28c28..8ce7f8bb8 100644
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -16,10 +16,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
 
 class cClientHandle;
 
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index fc886c51f..e98d0a395 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -15,16 +15,6 @@
 
 
 
-
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 // tolua_begin
 
 class cFlowerPotEntity :
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index 71c2fe127..0a66c60e3 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -8,11 +8,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
 class cClientHandle;
 
 
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h
index 7a69d6499..67a8aa62a 100644
--- a/src/BlockEntities/JukeboxEntity.h
+++ b/src/BlockEntities/JukeboxEntity.h
@@ -7,15 +7,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 // tolua_begin
 
 class cJukeboxEntity :
diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index 7132ef558..55e45f0a6 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -14,14 +14,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
-
-
-
 
 // tolua_begin
 
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 0d14ad647..696a109d1 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "MobSpawnerEntity.h"
-#include "json/json.h"
 
 #include "../World.h"
 #include "../FastRandom.h"
@@ -38,8 +37,8 @@ void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
 {
 	if (a_Player->GetEquippedItem().m_ItemType == E_ITEM_SPAWN_EGG)
 	{
-		cMonster::eType MonsterType = cItemSpawnEggHandler::ItemDamageToMonsterType(a_Player->GetEquippedItem().m_ItemDamage);
-		if (MonsterType == mtInvalidType)
+		eMonsterType MonsterType = cItemSpawnEggHandler::ItemDamageToMonsterType(a_Player->GetEquippedItem().m_ItemDamage);
+		if (MonsterType == eMonsterType::mtInvalidType)
 		{
 			return;
 		}
@@ -50,7 +49,7 @@ void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
 		{
 			a_Player->GetInventory().RemoveOneEquippedItem();
 		}
-		LOGD("Changed monster spawner entity to %s!", GetEntityName().c_str());
+		LOGD("Changed monster spawner at {%d, %d, %d} to type %s.", GetPosX(), GetPosY(), GetPosZ(), GetEntityName().c_str());
 	}
 }
 
@@ -105,7 +104,7 @@ bool cMobSpawnerEntity::Tick(float a_Dt, cChunk & a_Chunk)
 
 void cMobSpawnerEntity::ResetTimer(void)
 {
-	m_SpawnDelay = 200 + m_World->GetTickRandomNumber(600);
+	m_SpawnDelay = (short) (200 + m_World->GetTickRandomNumber(600));
 	m_World->BroadcastBlockEntity(m_PosX, m_PosY, m_PosZ);
 }
 
@@ -196,30 +195,6 @@ void cMobSpawnerEntity::SpawnEntity(void)
 
 
 
-bool cMobSpawnerEntity::LoadFromJson(const Json::Value & a_Value)
-{
-	m_PosX = a_Value.get("x", 0).asInt();
-	m_PosY = a_Value.get("y", 0).asInt();
-	m_PosZ = a_Value.get("z", 0).asInt();
-
-	return true;
-}
-
-
-
-
-
-void cMobSpawnerEntity::SaveToJson(Json::Value & a_Value)
-{
-	a_Value["x"] = m_PosX;
-	a_Value["y"] = m_PosY;
-	a_Value["z"] = m_PosZ;
-}
-
-
-
-
-
 AString cMobSpawnerEntity::GetEntityName() const
 {
 	switch (m_Entity)
diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h
index 7fec2699c..073eb03ab 100644
--- a/src/BlockEntities/MobSpawnerEntity.h
+++ b/src/BlockEntities/MobSpawnerEntity.h
@@ -8,15 +8,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 // tolua_begin
 
 class cMobSpawnerEntity :
@@ -54,23 +45,23 @@ public:
 	AString GetEntityName(void) const;
 
 	/** Returns the spawn delay. */
-	int GetSpawnDelay(void) const { return m_SpawnDelay; }
+	short GetSpawnDelay(void) const { return m_SpawnDelay; }
+
+	/** Sets the spawn delay. */
+	void SetSpawnDelay(short a_Delay) { m_SpawnDelay = a_Delay; }
 
 	int GetNearbyPlayersNum(void);
 	int GetNearbyMonsterNum(eMonsterType a_EntityType);
 
 	// tolua_end
 
-	bool LoadFromJson(const Json::Value & a_Value);
-	virtual void SaveToJson(Json::Value & a_Value) override;
-
 	static const char * GetClassStatic(void) { return "cMobSpawnerEntity"; }
 
 private:
 	/** The entity to spawn. */
 	eMonsterType m_Entity;
 
-	int m_SpawnDelay;
+	short m_SpawnDelay;
 
 	bool m_IsActive;
 } ;  // tolua_end
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index fc5f27d07..b33edba4e 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -5,12 +5,6 @@
 #include "RedstonePoweredEntity.h"
 
 
-namespace Json
-{
-	class Value;
-}
-
-
 
 
 
diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h
index 52baa486d..09ab46f0b 100644
--- a/src/BlockEntities/SignEntity.h
+++ b/src/BlockEntities/SignEntity.h
@@ -14,15 +14,6 @@
 
 
 
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 // tolua_begin
 
 class cSignEntity :
-- 
cgit v1.2.3


From a6ed5cb1d8edc3c2e0804df9345094c89965af4b Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 27 Nov 2014 22:42:08 +0100
Subject: BlockEntities: Removed the extra semicolon.

---
 src/BlockEntities/BeaconEntity.cpp       | 19 ++++++++++---------
 src/BlockEntities/BeaconEntity.h         |  2 +-
 src/BlockEntities/BlockEntityWithItems.h |  2 +-
 src/BlockEntities/ChestEntity.h          |  2 +-
 src/BlockEntities/CommandBlockEntity.h   |  2 +-
 src/BlockEntities/DispenserEntity.h      |  2 +-
 src/BlockEntities/DropSpenserEntity.h    |  2 +-
 src/BlockEntities/DropperEntity.h        |  2 +-
 src/BlockEntities/EnderChestEntity.h     |  2 +-
 src/BlockEntities/FlowerPotEntity.h      |  2 +-
 src/BlockEntities/FurnaceEntity.h        |  2 +-
 src/BlockEntities/HopperEntity.h         |  2 +-
 src/BlockEntities/JukeboxEntity.h        |  2 +-
 src/BlockEntities/MobHeadEntity.h        |  2 +-
 src/BlockEntities/NoteEntity.h           |  2 +-
 src/BlockEntities/SignEntity.h           |  2 +-
 16 files changed, 25 insertions(+), 24 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp
index 85819446c..409f2937c 100644
--- a/src/BlockEntities/BeaconEntity.cpp
+++ b/src/BlockEntities/BeaconEntity.cpp
@@ -247,15 +247,16 @@ void cBeaconEntity::GiveEffects(void)
 		}
 
 	public:
-		cPlayerCallback(int a_Radius, int a_PosX, int a_PosY, int a_PosZ, cEntityEffect::eType a_PrimaryEffect, cEntityEffect::eType a_SecondaryEffect, short a_EffectLevel)
-			: m_Radius(a_Radius)
-			, m_PosX(a_PosX)
-			, m_PosY(a_PosY)
-			, m_PosZ(a_PosZ)
-			, m_PrimaryEffect(a_PrimaryEffect)
-			, m_SecondaryEffect(a_SecondaryEffect)
-			, m_EffectLevel(a_EffectLevel)
-		{};
+		cPlayerCallback(int a_Radius, int a_PosX, int a_PosY, int a_PosZ, cEntityEffect::eType a_PrimaryEffect, cEntityEffect::eType a_SecondaryEffect, short a_EffectLevel):
+			m_Radius(a_Radius),
+			m_PosX(a_PosX),
+			m_PosY(a_PosY),
+			m_PosZ(a_PosZ),
+			m_PrimaryEffect(a_PrimaryEffect),
+			m_SecondaryEffect(a_SecondaryEffect),
+			m_EffectLevel(a_EffectLevel)
+		{
+		}
 
 	} PlayerCallback(Radius, m_PosX, m_PosY, m_PosZ, m_PrimaryEffect, SecondaryEffect, EffectLevel);
 	GetWorld()->ForEachPlayer(PlayerCallback);
diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h
index d1db3a68f..0417e0464 100644
--- a/src/BlockEntities/BeaconEntity.h
+++ b/src/BlockEntities/BeaconEntity.h
@@ -32,7 +32,7 @@ class cBeaconEntity :
 public:
 	// tolua_end
 
-	BLOCKENTITY_PROTODEF(cBeaconEntity);
+	BLOCKENTITY_PROTODEF(cBeaconEntity)
 
 	cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index 8c7d4749b..2c2ced1cb 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -29,7 +29,7 @@ class cBlockEntityWithItems :
 public:
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cBlockEntityWithItems);
+	BLOCKENTITY_PROTODEF(cBlockEntityWithItems)
 	
 	cBlockEntityWithItems(
 		BLOCKTYPE a_BlockType,                      // Type of the block that the entity represents
diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h
index 09fffb923..5ab0a4800 100644
--- a/src/BlockEntities/ChestEntity.h
+++ b/src/BlockEntities/ChestEntity.h
@@ -33,7 +33,7 @@ public:
 	
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cChestEntity);
+	BLOCKENTITY_PROTODEF(cChestEntity)
 	
 	/** Constructor used for normal operation */
 	cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World, BLOCKTYPE a_Type);
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 217390293..8deff6964 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -36,7 +36,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cCommandBlockEntity);
+	BLOCKENTITY_PROTODEF(cCommandBlockEntity)
 	
 	/// Creates a new empty command block entity
 	cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index 5ba87b716..12e12942a 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -17,7 +17,7 @@ public:
 
 	// tolua_end
 
-	BLOCKENTITY_PROTODEF(cDispenserEntity);
+	BLOCKENTITY_PROTODEF(cDispenserEntity)
 	
 	/** Constructor used for normal operation */
 	cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h
index f77a28c28..9092bc077 100644
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -45,7 +45,7 @@ public:
 	
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cDropSpenserEntity);
+	BLOCKENTITY_PROTODEF(cDropSpenserEntity)
 	
 	cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 	virtual ~cDropSpenserEntity();
diff --git a/src/BlockEntities/DropperEntity.h b/src/BlockEntities/DropperEntity.h
index 91adf660f..c638dafa8 100644
--- a/src/BlockEntities/DropperEntity.h
+++ b/src/BlockEntities/DropperEntity.h
@@ -25,7 +25,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cDropperEntity);
+	BLOCKENTITY_PROTODEF(cDropperEntity)
 	
 	/// Constructor used for normal operation
 	cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
index 17abd880a..af59cf170 100644
--- a/src/BlockEntities/EnderChestEntity.h
+++ b/src/BlockEntities/EnderChestEntity.h
@@ -18,7 +18,7 @@ class cEnderChestEntity :
 public:
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cEnderChestEntity);
+	BLOCKENTITY_PROTODEF(cEnderChestEntity)
 	
 	cEnderChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 	virtual ~cEnderChestEntity();
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index fc886c51f..005a3841a 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -36,7 +36,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cFlowerPotEntity);
+	BLOCKENTITY_PROTODEF(cFlowerPotEntity)
 	
 	/** Creates a new flowerpot entity at the specified block coords. a_World may be nullptr */
 	cFlowerPotEntity(int a_BlocX, int a_BlockY, int a_BlockZ, cWorld * a_World);
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index 71c2fe127..1ad812d8b 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -38,7 +38,7 @@ public:
 	
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cFurnaceEntity);
+	BLOCKENTITY_PROTODEF(cFurnaceEntity)
 	
 	/** Constructor used for normal operation */
 	cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h
index 7070bbad3..da65aa671 100644
--- a/src/BlockEntities/HopperEntity.h
+++ b/src/BlockEntities/HopperEntity.h
@@ -31,7 +31,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cHopperEntity);
+	BLOCKENTITY_PROTODEF(cHopperEntity)
 	
 	/// Constructor used for normal operation
 	cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h
index 7a69d6499..301d018d1 100644
--- a/src/BlockEntities/JukeboxEntity.h
+++ b/src/BlockEntities/JukeboxEntity.h
@@ -26,7 +26,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cJukeboxEntity);
+	BLOCKENTITY_PROTODEF(cJukeboxEntity)
 	
 	cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
 	virtual ~cJukeboxEntity();
diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index 7132ef558..de033fd16 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -34,7 +34,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cMobHeadEntity);
+	BLOCKENTITY_PROTODEF(cMobHeadEntity)
 	
 	/** Creates a new mob head entity at the specified block coords. a_World may be nullptr */
 	cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index fc5f27d07..d63ff56b6 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -40,7 +40,7 @@ public:
 
 	// tolua_end
 
-	BLOCKENTITY_PROTODEF(cNoteEntity);
+	BLOCKENTITY_PROTODEF(cNoteEntity)
 	
 	/// Creates a new note entity. a_World may be nullptr
 	cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h
index 52baa486d..347689d0a 100644
--- a/src/BlockEntities/SignEntity.h
+++ b/src/BlockEntities/SignEntity.h
@@ -34,7 +34,7 @@ public:
 
 	// tolua_end
 	
-	BLOCKENTITY_PROTODEF(cSignEntity);
+	BLOCKENTITY_PROTODEF(cSignEntity)
 	
 	/// Creates a new empty sign entity at the specified block coords and block type (wall or standing). a_World may be nullptr
 	cSignEntity(BLOCKTYPE a_BlockType, int a_X, int a_Y, int a_Z, cWorld * a_World);
-- 
cgit v1.2.3


From 2478e290f9f7f6a74bba4ac885cfaef6327bc9ee Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Sat, 29 Nov 2014 15:20:44 +0100
Subject: Many api fixes, add vanilla names to mob type -> string functions and
 mob spawner fixes.

---
 src/BlockEntities/MobHeadEntity.h      | 12 ++++-----
 src/BlockEntities/MobSpawnerEntity.cpp | 47 +---------------------------------
 src/BlockEntities/MobSpawnerEntity.h   | 10 ++++----
 3 files changed, 12 insertions(+), 57 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index e26c0bdd0..7f08c5ab2 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -33,22 +33,22 @@ public:
 
 	// tolua_begin
 	
-	/** Set the Type */
+	/** Set the type of the mob head */
 	void SetType(const eMobHeadType & a_SkullType);
 	
-	/** Set the Rotation */
+	/** Set the rotation of the mob head */
 	void SetRotation(eMobHeadRotation a_Rotation);
 	
-	/** Set the Player Name for Mobheads with Player type */
+	/** Set the player name for mob heads with player type */
 	void SetOwner(const AString & a_Owner);
 	
-	/** Get the Type */
+	/** Returns the type of the mob head */
 	eMobHeadType GetType(void) const { return m_Type; }
 	
-	/** Get the Rotation */
+	/** Returns the rotation of the mob head */
 	eMobHeadRotation GetRotation(void) const { return m_Rotation; }
 	
-	/** Get the setted Player Name */
+	/** Returns the player name of the mob head */
 	AString GetOwner(void) const { return m_Owner; }
 	
 	// tolua_end
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 696a109d1..26499972d 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -49,7 +49,7 @@ void cMobSpawnerEntity::UsedBy(cPlayer * a_Player)
 		{
 			a_Player->GetInventory().RemoveOneEquippedItem();
 		}
-		LOGD("Changed monster spawner at {%d, %d, %d} to type %s.", GetPosX(), GetPosY(), GetPosZ(), GetEntityName().c_str());
+		LOGD("Changed monster spawner at {%d, %d, %d} to type %s.", GetPosX(), GetPosY(), GetPosZ(), cMonster::MobTypeToString(MonsterType).c_str());
 	}
 }
 
@@ -195,51 +195,6 @@ void cMobSpawnerEntity::SpawnEntity(void)
 
 
 
-AString cMobSpawnerEntity::GetEntityName() const
-{
-	switch (m_Entity)
-	{
-		case mtBat:          return "Bat";
-		case mtBlaze:        return "Blaze";
-		case mtCaveSpider:   return "CaveSpider";
-		case mtChicken:      return "Chicken";
-		case mtCow:          return "Cow";
-		case mtCreeper:      return "Creeper";
-		case mtEnderDragon:  return "EnderDragon";
-		case mtEnderman:     return "Enderman";
-		case mtGhast:        return "Ghast";
-		case mtGiant:        return "Giant";
-		case mtHorse:        return "EntityHorse";
-		case mtIronGolem:    return "VillagerGolem";
-		case mtMagmaCube:    return "LavaSlime";
-		case mtMooshroom:    return "MushroomCow";
-		case mtOcelot:       return "Ozelot";
-		case mtPig:          return "Pig";
-		case mtSheep:        return "Sheep";
-		case mtSilverfish:   return "Silverfish";
-		case mtSkeleton:     return "Skeleton";
-		case mtSlime:        return "Slime";
-		case mtSnowGolem:    return "SnowMan";
-		case mtSpider:       return "Spider";
-		case mtSquid:        return "Squid";
-		case mtVillager:     return "Villager";
-		case mtWitch:        return "Witch";
-		case mtWither:       return "WitherBoss";
-		case mtWolf:         return "Wolf";
-		case mtZombie:       return "Zombie";
-		case mtZombiePigman: return "PigZombie";
-		default:
-		{
-			ASSERT(!"Unknown monster type!");
-			return "Pig";
-		}
-	}
-}
-
-
-
-
-
 int cMobSpawnerEntity::GetNearbyPlayersNum(void)
 {
 	Vector3d SpawnerPos(m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5);
diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h
index 073eb03ab..0a3367c97 100644
--- a/src/BlockEntities/MobSpawnerEntity.h
+++ b/src/BlockEntities/MobSpawnerEntity.h
@@ -35,22 +35,22 @@ public:
 	/** Spawns the entity. This function automaticly change the spawn delay! */
 	void SpawnEntity(void);
 
-	/** Returns the entity type who will be spawn by this mob spawner. */
+	/** Returns the entity type that will be spawn by this mob spawner. */
 	eMonsterType GetEntity(void) const { return m_Entity; }
 
 	/** Sets the entity type who will be spawn by this mob spawner. */
 	void SetEntity(eMonsterType a_EntityType) { m_Entity = a_EntityType; }
 
-	/** Returns the entity name. (Required by the protocol) */
-	AString GetEntityName(void) const;
-
-	/** Returns the spawn delay. */
+	/** Returns the spawn delay. This is the tick delay that is needed to spawn new monsters. */
 	short GetSpawnDelay(void) const { return m_SpawnDelay; }
 
 	/** Sets the spawn delay. */
 	void SetSpawnDelay(short a_Delay) { m_SpawnDelay = a_Delay; }
 
+	/** Returns the amount of the nearby players in a 16-block radius. */
 	int GetNearbyPlayersNum(void);
+
+	/** Returns the amount of this monster type in a 8-block radius (Y: 4-block radius). */
 	int GetNearbyMonsterNum(eMonsterType a_EntityType);
 
 	// tolua_end
-- 
cgit v1.2.3


From bcbd73f7d80b0a64b87c30840048f99613308ce0 Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Mon, 1 Dec 2014 14:58:13 +0100
Subject: MobSpawner fixes.

---
 src/BlockEntities/BlockEntity.cpp      | 2 +-
 src/BlockEntities/MobSpawnerEntity.cpp | 4 ++--
 src/BlockEntities/MobSpawnerEntity.h   | 7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/BlockEntities')

diff --git a/src/BlockEntities/BlockEntity.cpp b/src/BlockEntities/BlockEntity.cpp
index 346970cd2..c59198e79 100644
--- a/src/BlockEntities/BlockEntity.cpp
+++ b/src/BlockEntities/BlockEntity.cpp
@@ -36,8 +36,8 @@ cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE
 		case E_BLOCK_ENDER_CHEST:   return new cEnderChestEntity  (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_FLOWER_POT:    return new cFlowerPotEntity   (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_FURNACE:       return new cFurnaceEntity     (a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_World);
-		case E_BLOCK_HOPPER:        return new cHopperEntity      (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_HEAD:          return new cMobHeadEntity     (a_BlockX, a_BlockY, a_BlockZ, a_World);
+		case E_BLOCK_HOPPER:        return new cHopperEntity      (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_MOB_SPAWNER:   return new cMobSpawnerEntity  (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_JUKEBOX:       return new cJukeboxEntity     (a_BlockX, a_BlockY, a_BlockZ, a_World);
 		case E_BLOCK_LIT_FURNACE:   return new cFurnaceEntity     (a_BlockX, a_BlockY, a_BlockZ, a_BlockType, a_BlockMeta, a_World);
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp
index 26499972d..5edee888a 100644
--- a/src/BlockEntities/MobSpawnerEntity.cpp
+++ b/src/BlockEntities/MobSpawnerEntity.cpp
@@ -104,7 +104,7 @@ bool cMobSpawnerEntity::Tick(float a_Dt, cChunk & a_Chunk)
 
 void cMobSpawnerEntity::ResetTimer(void)
 {
-	m_SpawnDelay = (short) (200 + m_World->GetTickRandomNumber(600));
+	m_SpawnDelay = static_cast<short>(200 + m_World->GetTickRandomNumber(600));
 	m_World->BroadcastBlockEntity(m_PosX, m_PosY, m_PosZ);
 }
 
@@ -266,7 +266,7 @@ int cMobSpawnerEntity::GetNearbyMonsterNum(eMonsterType a_EntityType)
 				return;
 			}
 
-			if (((m_SpawnerPos - a_Entity->GetPosition()).Length() <= 8) && (Diff(m_SpawnerPos.y, a_Entity->GetPosY()) <= 4.0))
+			if ((Diff(m_SpawnerPos.x, a_Entity->GetPosX()) <= 8.0) && (Diff(m_SpawnerPos.y, a_Entity->GetPosY()) <= 4.0) && (Diff(m_SpawnerPos.z, a_Entity->GetPosZ()) <= 8.0))
 			{
 				m_NumEntities++;
 			}
diff --git a/src/BlockEntities/MobSpawnerEntity.h b/src/BlockEntities/MobSpawnerEntity.h
index 0a3367c97..594b5301e 100644
--- a/src/BlockEntities/MobSpawnerEntity.h
+++ b/src/BlockEntities/MobSpawnerEntity.h
@@ -1,3 +1,10 @@
+// MobSpawnerEntity.h
+
+// Declares the cMobSpawnerEntity class representing a single mob spawner in the world
+
+
+
+
 
 #pragma once
 
-- 
cgit v1.2.3