3 files changed, 8 insertions, 6 deletions

diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 4a4898179..b1acede77 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -242,7 +242,7 @@ public:  // tolua_export
 	/** Returns the view distance that the player request, not the used view distance. */
 	int GetRequestedViewDistance(void) const { return m_RequestedViewDistance; }
 
-	void SetLocale(AString & a_Locale) { m_Locale = a_Locale; }
+	void SetLocale(const AString & a_Locale) { m_Locale = a_Locale; }
 	AString GetLocale(void) const { return m_Locale; }
 
 	int GetUniqueID(void) const { return m_UniqueID; }
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 7b934fb23..3dc2d8f42 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -217,7 +217,6 @@ public:
 	int GetChunkZ(void) const { return FloorC(m_Position.z / cChunkDef::Width); }
 
 	void SetHeadYaw (double a_HeadYaw);
-	void SetHeight  (double a_Height);
 	void SetMass    (double a_Mass);
 	void SetPosX    (double a_PosX) { SetPosition({a_PosX, m_Position.y, m_Position.z}); }
 	void SetPosY    (double a_PosY) { SetPosition({m_Position.x, a_PosY, m_Position.z}); }
@@ -243,8 +242,6 @@ public:
 	/** Sets the speed in the Z axis, leaving the other speed components intact. Measured in m / sec. */
 	void SetSpeedZ(double a_SpeedZ);
 
-	void SetWidth   (double a_Width);
-
 	void AddPosX    (double a_AddPosX) { AddPosition(a_AddPosX, 0, 0); }
 	void AddPosY    (double a_AddPosY) { AddPosition(0, a_AddPosY, 0); }
 	void AddPosZ    (double a_AddPosZ) { AddPosition(0, 0, a_AddPosZ); }
@@ -300,6 +297,10 @@ public:
 
 	// tolua_end
 
+	void SetHeight(double a_Height);
+
+	void SetWidth(double a_Width);
+
 	/** Exported in ManualBindings */
 	const Vector3d & GetPosition(void) const { return m_Position; }
 
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h
index fc364404b..bb78bfaeb 100644
--- a/src/Entities/SplashPotionEntity.h
+++ b/src/Entities/SplashPotionEntity.h
@@ -41,16 +41,17 @@ public:
 
 	// tolua_begin
 	cEntityEffect::eType GetEntityEffectType(void) const { return m_EntityEffectType; }
-	cEntityEffect        GetEntityEffect(void)     const { return m_EntityEffect; }
 	int                  GetPotionColor(void)      const { return m_PotionColor; }
 	const cItem &        GetItem(void)             const { return m_Item; }
 
 	void SetEntityEffectType(cEntityEffect::eType a_EntityEffectType) { m_EntityEffectType = a_EntityEffectType; }
-	void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; }
 	void SetPotionColor(int a_PotionColor) { m_PotionColor = a_PotionColor; }
 
 	// tolua_end
 
+	cEntityEffect        GetEntityEffect(void)     const { return m_EntityEffect; }
+	void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; }
+
 protected:
 
 	cEntityEffect::eType m_EntityEffectType;