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/server.cpp | |
| 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/server.cpp')
| -rw-r--r-- | src/server.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp index 8fbc0f793..11c11b259 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2964,7 +2964,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) <<pointed.object_id<<std::endl; // Do stuff - pointed_object->punch(srp); + pointed_object->punch(srp, srp->m_time_from_last_punch); + srp->m_time_from_last_punch = 0; } } // action == 0 |