MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix github issue #224

master
Perttu Ahola 2012-09-01 18:32:15 +03:00
parent 7a14171be4
commit b6c12d2aa3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server.cpp
View File

@ -442,9 +442,12 @@ void RemoteClient::GetNextBlocks(Server *server, float dtime,
m_nearest_unsent_reset_timer += dtime; m_nearest_unsent_reset_timer += dtime;
if(m_nothing_to_send_pause_timer >= 0) if(m_nothing_to_send_pause_timer >= 0)
{
return; return;
}
Player *player = server->m_env->getPlayer(peer_id);
// This can happen sometimes; clients and players are not in perfect sync.
if(player == NULL)
return;
// Won't send anything if already sending // Won't send anything if already sending
if(m_blocks_sending.size() >= g_settings->getU16 if(m_blocks_sending.size() >= g_settings->getU16
@ -456,10 +459,6 @@ void RemoteClient::GetNextBlocks(Server *server, float dtime,
//TimeTaker timer("RemoteClient::GetNextBlocks"); //TimeTaker timer("RemoteClient::GetNextBlocks");
Player *player = server->m_env->getPlayer(peer_id);
assert(player != NULL);
v3f playerpos = player->getPosition(); v3f playerpos = player->getPosition();
v3f playerspeed = player->getSpeed(); v3f playerspeed = player->getSpeed();
v3f playerspeeddir(0,0,0); v3f playerspeeddir(0,0,0);