cPlayer should override IsOnGround()

cuberite · Feb 7, 2015 · 7813cd2 · 7813cd2
1 parent 9b9ce6f
commit 7813cd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
@@ -444,8 +444,8 @@ class cEntity
 	/** Set the invulnerable ticks from the entity */
 	void SetInvulnerableTicks(int a_InvulnerableTicks) { m_InvulnerableTicks = a_InvulnerableTicks; }
 
-	/** Returns whether the player is on ground or not */
-	bool IsOnGround(void) const { return m_bOnGround; }
+	/** Returns whether the entity is on ground or not */
+	virtual bool IsOnGround(void) const { return m_bOnGround; }
 
 	// tolua_end
 

diff --git a/src/Entities/Player.h b/src/Entities/Player.h
@@ -121,7 +121,7 @@ class cPlayer :
 	inline void SetStance( const double a_Stance) { m_Stance = a_Stance; }
 	double GetEyeHeight(void) const;  // tolua_export
 	Vector3d GetEyePosition(void) const;  // tolua_export
-	inline bool IsOnGround(void) const {return m_bTouchGround; }  // tolua_export
+	virtual bool IsOnGround(void) const override {return m_bTouchGround; }
 	inline double GetStance(void) const { return GetPosY() + 1.62; }  // tolua_export  // TODO: Proper stance when crouching etc.
 	inline cInventory &       GetInventory(void)       { return m_Inventory; }  // tolua_export
 	inline const cInventory & GetInventory(void) const { return m_Inventory; }