diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-01-17 02:40:53 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-01-17 02:40:53 +0200 |
commit | 3891bc43e084b9bd1c345638dfbbffa9d71658c9 (patch) | |
tree | 1a32921c26409c735c062bfc8131b0c71728fadb /src/server.h | |
parent | 7068bc90af1f452359a1fcfe20fa01fc88f3d70a (diff) | |
download | minetest-3891bc43e084b9bd1c345638dfbbffa9d71658c9.tar.gz minetest-3891bc43e084b9bd1c345638dfbbffa9d71658c9.tar.bz2 minetest-3891bc43e084b9bd1c345638dfbbffa9d71658c9.zip |
fine-tuning of map generator and server and stuff.
Diffstat (limited to 'src/server.h')
-rw-r--r-- | src/server.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/server.h b/src/server.h index 099be9e14..3d7d133fc 100644 --- a/src/server.h +++ b/src/server.h @@ -231,7 +231,8 @@ public: u8 pending_serialization_version; RemoteClient(): - m_time_from_building(9999) + m_time_from_building(9999), + m_excess_gotblocks(0) { peer_id = 0; serialization_version = SER_FMT_VER_INVALID; @@ -295,7 +296,9 @@ public: <<", m_blocks_sent.size()="<<m_blocks_sent.size() <<", m_blocks_sending.size()="<<m_blocks_sending.size() <<", m_nearest_unsent_d="<<m_nearest_unsent_d + <<", m_excess_gotblocks="<<m_excess_gotblocks <<std::endl; + m_excess_gotblocks = 0; } // Time from last placing or removing blocks @@ -347,6 +350,15 @@ private: */ core::map<v3s16, float> m_blocks_sending; JMutex m_blocks_sending_mutex; + + /* + Count of excess GotBlocks(). + There is an excess amount because the client sometimes + gets a block so late that the server sends it again, + and the client then sends two GOTBLOCKs. + This is resetted by PrintInfo() + */ + u32 m_excess_gotblocks; }; /*struct ServerSettings |