jachoo
/
minetest-jachoo2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Server: Only send node removal/addition to client if client's player is near it. Otherwise set the modified blocks unsent.

master
Perttu Ahola 2011-04-06 11:02:39 +03:00
parent b5ace9a064
commit 3269fce795
2 changed files with 86 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/server.cpp
View File

@ -2100,9 +2100,12 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
}
/*
Send the removal to all other clients
Send the removal to all other clients.
- If other player is close, send REMOVENODE
- Otherwise set blocks not sent
*/
sendRemoveNode(p_under, peer_id);
core::list<u16> far_players;
sendRemoveNode(p_under, peer_id, &far_players, 100);
/*
Update and send inventory
@ -2179,6 +2182,20 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
m_ignore_map_edit_events = true;
m_env.getMap().removeNodeAndUpdate(p_under, modified_blocks);
m_ignore_map_edit_events = false;
/*
Set blocks not sent to far players
*/
for(core::list<u16>::Iterator
i = far_players.begin();
i != far_players.end(); i++)
{
u16 peer_id = *i;
RemoteClient *client = getClient(peer_id);
if(client==NULL)
continue;
client->SetBlocksNotSent(modified_blocks);
}
}
/*
@ -2243,7 +2260,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/*
Send to all players
*/
sendAddNode(p_over, n, 0);
core::list<u16> far_players;
sendAddNode(p_over, n, 0, &far_players, 100);
/*
Handle inventory
@ -2270,6 +2288,20 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
m_env.getMap().addNodeAndUpdate(p_over, n, modified_blocks);
m_ignore_map_edit_events = false;
/*
Set blocks not sent to far players
*/
for(core::list<u16>::Iterator
i = far_players.begin();
i != far_players.end(); i++)
{
u16 peer_id = *i;
RemoteClient *client = getClient(peer_id);
if(client==NULL)
continue;
client->SetBlocksNotSent(modified_blocks);
}
/*
Calculate special events
*/
@ -3306,8 +3338,12 @@ void Server::BroadcastChatMessage(const std::wstring &message)
}
}
void Server::sendRemoveNode(v3s16 p, u16 ignore_id)
void Server::sendRemoveNode(v3s16 p, u16 ignore_id,
core::list<u16> *far_players, float far_d_nodes)
{
float maxd = far_d_nodes*BS;
v3f p_f = intToFloat(p, BS);
// Create packet
u32 replysize = 8;
SharedBuffer<u8> reply(replysize);
@ -3330,13 +3366,33 @@ void Server::sendRemoveNode(v3s16 p, u16 ignore_id)
if(client->peer_id == ignore_id)
continue;
if(far_players)
{
// Get player
Player *player = m_env.getPlayer(client->peer_id);
if(player)
{
// If player is far away, only set modified blocks not sent
v3f player_pos = player->getPosition();
if(player_pos.getDistanceFrom(p_f) > maxd)
{
far_players->push_back(client->peer_id);
continue;
}
}
}
// Send as reliable
m_con.Send(client->peer_id, 0, reply, true);
}
}
void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id)
void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
core::list<u16> *far_players, float far_d_nodes)
{
float maxd = far_d_nodes*BS;
v3f p_f = intToFloat(p, BS);
for(core::map<u16, RemoteClient*>::Iterator
i = m_clients.getIterator();
i.atEnd() == false; i++)
@ -3351,6 +3407,22 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id)
if(client->peer_id == ignore_id)
continue;
if(far_players)
{
// Get player
Player *player = m_env.getPlayer(client->peer_id);
if(player)
{
// If player is far away, only set modified blocks not sent
v3f player_pos = player->getPosition();
if(player_pos.getDistanceFrom(p_f) > maxd)
{
far_players->push_back(client->peer_id);
continue;
}
}
}
// Create packet
u32 replysize = 8 + MapNode::serializedLength(client->serialization_version);
SharedBuffer<u8> reply(replysize);

11
src/server.h
View File

@ -403,8 +403,15 @@ private:
void SendInventory(u16 peer_id);
void SendChatMessage(u16 peer_id, const std::wstring &message);
void BroadcastChatMessage(const std::wstring &message);
void sendRemoveNode(v3s16 p, u16 ignore_id=0);
void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0);
/*
Send a node removal/addition event to all clients except ignore_id.
Additionally, if far_players!=NULL, players further away than
far_d_nodes are ignored and their peer_ids are added to far_players
*/
void sendRemoveNode(v3s16 p, u16 ignore_id=0,
core::list<u16> *far_players=NULL, float far_d_nodes=100);
void sendAddNode(v3s16 p, MapNode n, u16 ignore_id=0,
core::list<u16> *far_players=NULL, float far_d_nodes=100);
// Environment and Connection must be locked when called
void SendBlockNoLock(u16 peer_id, MapBlock *block, u8 ver);