summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-05-31 00:15:43 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-05-31 00:15:43 +0300
commit223b3793485a76f87599d39364b1003c2ca7c49c (patch)
tree67b2dcc8603a01a32e33d3f0004e7cf4797df2c0 /src/server.h
parent16fdb42590dc14772fcf0cc95c6baf08e6f583cd (diff)
downloadminetest-223b3793485a76f87599d39364b1003c2ca7c49c.tar.gz
minetest-223b3793485a76f87599d39364b1003c2ca7c49c.tar.bz2
minetest-223b3793485a76f87599d39364b1003c2ca7c49c.zip
Reduced the CPU usage of the sent block selector algorithm
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/server.h b/src/server.h
index 7b73e476c..6bee10685 100644
--- a/src/server.h
+++ b/src/server.h
@@ -500,6 +500,15 @@ private:
// When called, connection mutex should be locked
RemoteClient* getClient(u16 peer_id);
+ // When called, environment mutex should be locked
+ std::string getPlayerName(u16 peer_id)
+ {
+ Player *player = m_env.getPlayer(peer_id);
+ if(player == NULL)
+ return "[id="+itos(peer_id);
+ return player->getName();
+ }
+
/*
Get a player from memory or creates one.
If player is already connected, return NULL
@@ -627,6 +636,8 @@ private:
*/
u16 m_ignore_map_edit_events_peer_id;
+ Profiler *m_profiler;
+
friend class EmergeThread;
friend class RemoteClient;
};