summaryrefslogtreecommitdiff
path: root/src/server.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-12-02 11:16:51 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-12-02 11:16:51 +0200
commit2dc9a0c724dafde4a4858060268f3bec1b7cb720 (patch)
tree6f49e43209e057c278a06cc689c340caf84095ab /src/server.cpp
parentc3579851354e92a24991c2c3a7844295b7d13a26 (diff)
downloadminetest-2dc9a0c724dafde4a4858060268f3bec1b7cb720.tar.gz
minetest-2dc9a0c724dafde4a4858060268f3bec1b7cb720.tar.bz2
minetest-2dc9a0c724dafde4a4858060268f3bec1b7cb720.zip
Fix player double damage
Diffstat (limited to 'src/server.cpp')
-rw-r--r--src/server.cpp2
1 files changed, 2 insertions, 0 deletions
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)