diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-12-04 14:43:01 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-12-04 14:43:01 +0200 |
| commit | 4cc117ddf6149b5b488e598a620674c8df208eac (patch) | |
| tree | 32881a0ac8394cf7bdea5ab8dc26195c711a6ed9 /src/serverremoteplayer.h | |
| parent | ceaf8edaded4c9e8f2e6fa285d9765e7095df332 (diff) | |
| download | minetest-4cc117ddf6149b5b488e598a620674c8df208eac.tar.gz minetest-4cc117ddf6149b5b488e598a620674c8df208eac.tar.bz2 minetest-4cc117ddf6149b5b488e598a620674c8df208eac.zip | |
Properly use time_from_last_punch for limiting PvP punch damage
Diffstat (limited to 'src/serverremoteplayer.h')
| -rw-r--r-- | src/serverremoteplayer.h | 5 |
1 files changed, 4 insertions, 1 deletions
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; |