From 4cc117ddf6149b5b488e598a620674c8df208eac Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 4 Dec 2011 14:43:01 +0200 Subject: Properly use time_from_last_punch for limiting PvP punch damage --- src/serverremoteplayer.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/serverremoteplayer.h') diff --git a/src/serverremoteplayer.h b/src/serverremoteplayer.h index 15a9ebc38..bdc3bba20 100644 --- a/src/serverremoteplayer.h +++ b/src/serverremoteplayer.h @@ -74,7 +74,8 @@ public: void rightClick(ServerActiveObject *clicker); void setPos(v3f pos); void moveTo(v3f pos, bool continuous); - virtual std::string getDescription(){return getName();} + virtual std::string getDescription() + {return std::string("player ")+getName();} virtual void getWieldDiggingProperties(ToolDiggingProperties *dst); virtual void damageWieldedItem(u16 amount); @@ -93,6 +94,8 @@ public: bool m_hp_not_sent; bool m_respawn_active; bool m_is_in_environment; + // Incremented by step(), read and reset by Server + float m_time_from_last_punch; private: bool m_position_not_sent; -- cgit v1.2.3