From 2dc9a0c724dafde4a4858060268f3bec1b7cb720 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 2 Dec 2011 11:16:51 +0200
Subject: Fix player double damage

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

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 361be9efd..f12fd261e 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2128,6 +2128,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 
 		// Add PlayerSAO
 		player->m_removed = false;
+		player->setId(0);
 		m_env->addActiveObject(player);
 
 		/*
@@ -2887,6 +2888,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 				<<PP(player->getPosition()/BS)<<std::endl;
 		
 		srp->m_removed = false;
+		srp->setId(0);
 		m_env->addActiveObject(srp);
 	}
 	else if(command == TOSERVER_INTERACT)
-- 
cgit v1.2.3