9 files changed, 40 insertions, 34 deletions

diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index c265c5043..7e429c62e 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -149,14 +149,14 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
 
 
 
-void cArrowEntity::CollectedBy(cPlayer * a_Dest)
+void cArrowEntity::CollectedBy(cPlayer & a_Dest)
 {
-	if (m_IsInGround && !m_bIsCollected && CanPickup(*a_Dest))
+	if (m_IsInGround && !m_bIsCollected && CanPickup(a_Dest))
 	{
 		// Do not add the arrow to the inventory when the player is in creative:
-		if (!a_Dest->IsGameModeCreative())
+		if (!a_Dest.IsGameModeCreative())
 		{
-			int NumAdded = a_Dest->GetInventory().AddItem(E_ITEM_ARROW);
+			int NumAdded = a_Dest.GetInventory().AddItem(E_ITEM_ARROW);
 			if (NumAdded == 0)
 			{
 				// No space in the inventory
@@ -164,7 +164,7 @@ void cArrowEntity::CollectedBy(cPlayer * a_Dest)
 			}
 		}
 
-		GetWorld()->BroadcastCollectEntity(*this, *a_Dest);
+		GetWorld()->BroadcastCollectEntity(*this, a_Dest);
 		GetWorld()->BroadcastSoundEffect("random.pop", GetPosX(), GetPosY(), GetPosZ(), 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
 		m_bIsCollected = true;
 	}
@@ -229,3 +229,7 @@ void cArrowEntity::Tick(float a_Dt, cChunk & a_Chunk)
 		}
 	}
 }
+
+
+
+
diff --git a/src/Entities/ArrowEntity.h b/src/Entities/ArrowEntity.h
index a1e7a17e7..1e4d8eebb 100644
--- a/src/Entities/ArrowEntity.h
+++ b/src/Entities/ArrowEntity.h
@@ -97,7 +97,7 @@ protected:
 	// cProjectileEntity overrides:
 	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
 	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
-	virtual void CollectedBy(cPlayer * a_Player) override;
+	virtual void CollectedBy(cPlayer & a_Player) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	
 };  // tolua_export
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 3fa7e80c1..07754791d 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -27,9 +27,9 @@
 		return super::GetClass(); \
 	}
 
-#define POSX_TOINT (int)floor(GetPosX())
-#define POSY_TOINT (int)floor(GetPosY())
-#define POSZ_TOINT (int)floor(GetPosZ())
+#define POSX_TOINT FloorC(GetPosX())
+#define POSY_TOINT FloorC(GetPosY())
+#define POSZ_TOINT FloorC(GetPosZ())
 #define POS_TOINT  Vector3i(POSXTOINT, POSYTOINT, POSZTOINT)
 
 #define GET_AND_VERIFY_CURRENT_CHUNK(ChunkVarName, X, Z) cChunk * ChunkVarName = a_Chunk.GetNeighborChunk(X, Z); if ((ChunkVarName == NULL) || !ChunkVarName->IsValid()) { return; }
@@ -172,13 +172,13 @@ public:
 	/// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true)
 	virtual bool IsA(const char * a_ClassName) const;
 	
-	/// Returns the topmost class name for the object
-	virtual const char * GetClass(void) const;
-	
-	// Returns the class name of this class
+	/** Returns the class name of this class */
 	static const char * GetClassStatic(void);
 	
-	/// Returns the topmost class's parent class name for the object. cEntity returns an empty string (no parent).
+	/** Returns the topmost class name for the object */
+	virtual const char * GetClass(void) const;
+	
+	/** Returns the topmost class's parent class name for the object. cEntity returns an empty string (no parent). */
 	virtual const char * GetParentClass(void) const;
 
 	cWorld * GetWorld(void) const { return m_World; }
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index 6b6ad36b5..ab906fd06 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -127,7 +127,7 @@ public:
 		ContentsWidth = 9,
 	};
 	
-	const cItem & GetSlot(int a_Idx) const { return m_Contents.GetSlot(a_Idx); }	
+	const cItem & GetSlot(int a_Idx) const { return m_Contents.GetSlot(a_Idx); }
 	void SetSlot(size_t a_Idx, const cItem & a_Item) { m_Contents.SetSlot(a_Idx, a_Item); }
 
 protected:
diff --git a/src/Entities/Pickup.cpp b/src/Entities/Pickup.cpp
index 87b5bed07..e5e28446d 100644
--- a/src/Entities/Pickup.cpp
+++ b/src/Entities/Pickup.cpp
@@ -191,10 +191,8 @@ void cPickup::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
-bool cPickup::CollectedBy(cPlayer * a_Dest)
+bool cPickup::CollectedBy(cPlayer & a_Dest)
 {
-	ASSERT(a_Dest != NULL);
-	
 	if (m_bCollected)
 	{
 		// LOG("Pickup %d cannot be collected by \"%s\", because it has already been collected.", m_UniqueID, a_Dest->GetName().c_str());
@@ -214,21 +212,21 @@ bool cPickup::CollectedBy(cPlayer * a_Dest)
 		return false;
 	}
 
-	int NumAdded = a_Dest->GetInventory().AddItem(m_Item);
+	int NumAdded = a_Dest.GetInventory().AddItem(m_Item);
 	if (NumAdded > 0)
 	{
 		// Check achievements
 		switch (m_Item.m_ItemType)
 		{
-			case E_BLOCK_LOG:      a_Dest->AwardAchievement(achMineWood); break;
-			case E_ITEM_LEATHER:   a_Dest->AwardAchievement(achKillCow);  break;
-			case E_ITEM_DIAMOND:   a_Dest->AwardAchievement(achDiamonds); break;
-			case E_ITEM_BLAZE_ROD: a_Dest->AwardAchievement(achBlazeRod); break;
+			case E_BLOCK_LOG:      a_Dest.AwardAchievement(achMineWood); break;
+			case E_ITEM_LEATHER:   a_Dest.AwardAchievement(achKillCow);  break;
+			case E_ITEM_DIAMOND:   a_Dest.AwardAchievement(achDiamonds); break;
+			case E_ITEM_BLAZE_ROD: a_Dest.AwardAchievement(achBlazeRod); break;
 			default: break;
 		}
 
 		m_Item.m_ItemCount -= NumAdded;
-		m_World->BroadcastCollectEntity(*this, *a_Dest);
+		m_World->BroadcastCollectEntity(*this, a_Dest);
 		// Also send the "pop" sound effect with a somewhat random pitch (fast-random using EntityID ;)
 		m_World->BroadcastSoundEffect("random.pop", GetPosX(), GetPosY(), GetPosZ(), 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
 		if (m_Item.m_ItemCount <= 0)
diff --git a/src/Entities/Pickup.h b/src/Entities/Pickup.h
index 4d5250819..b3cbeee0b 100644
--- a/src/Entities/Pickup.h
+++ b/src/Entities/Pickup.h
@@ -32,7 +32,7 @@ public:
 
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 
-	bool CollectedBy(cPlayer * a_Dest);  // tolua_export
+	bool CollectedBy(cPlayer & a_Dest);  // tolua_export
 
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index f58a0a016..6bd0a3d20 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -245,7 +245,7 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
 
 	if (m_Health > 0)  // make sure player is alive
 	{
-		m_World->CollectPickupsByPlayer(this);
+		m_World->CollectPickupsByPlayer(*this);
 
 		if ((m_EatingFinishTick >= 0) && (m_EatingFinishTick <= m_World->GetWorldAge()))
 		{
@@ -2134,19 +2134,19 @@ void cPlayer::ApplyFoodExhaustionFromMovement()
 void cPlayer::LoadRank(void)
 {
 	// Load the values from cRankManager:
-	cRankManager & RankMgr = cRoot::Get()->GetRankManager();
-	m_Rank = RankMgr.GetPlayerRankName(m_UUID);
+	cRankManager * RankMgr = cRoot::Get()->GetRankManager();
+	m_Rank = RankMgr->GetPlayerRankName(m_UUID);
 	if (m_Rank.empty())
 	{
-		m_Rank = RankMgr.GetDefaultRank();
+		m_Rank = RankMgr->GetDefaultRank();
 	}
 	else
 	{
 		// Update the name:
-		RankMgr.UpdatePlayerName(m_UUID, m_PlayerName);
+		RankMgr->UpdatePlayerName(m_UUID, m_PlayerName);
 	}
-	m_Permissions = RankMgr.GetPlayerPermissions(m_UUID);
-	RankMgr.GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
+	m_Permissions = RankMgr->GetPlayerPermissions(m_UUID);
+	RankMgr->GetRankVisuals(m_Rank, m_MsgPrefix, m_MsgSuffix, m_MsgNameColorCode);
 
 	// Break up the individual permissions on each dot, into m_SplitPermissions:
 	m_SplitPermissions.clear();
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index acc9bd674..ab25ac30c 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -424,8 +424,12 @@ void cProjectileEntity::SpawnOn(cClientHandle & a_Client)
 
 
 
-void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
+void cProjectileEntity::CollectedBy(cPlayer & a_Dest)
 {
 	// Overriden in arrow
 	UNUSED(a_Dest);
 }
+
+
+
+
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index 990136a32..03eda9739 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -59,7 +59,7 @@ public:
 	}
 	
 	/// Called by Chunk when the projectile is eligible for player collection
-	virtual void CollectedBy(cPlayer * a_Dest);
+	virtual void CollectedBy(cPlayer & a_Dest);
 
 	// tolua_begin