From 4cc117ddf6149b5b488e598a620674c8df208eac Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 4 Dec 2011 14:43:01 +0200
Subject: Properly use time_from_last_punch for limiting PvP punch damage

---
 src/server.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/server.cpp')

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
-- 
cgit v1.2.3