oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Mark liquid and light updates low priority

Browse source
This commit is contained in:
Lars 2025-04-21 17:06:01 -07:00 • committed by lhofhansl
parent 2a3427a39c
commit 00addc3e5d
5 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/map.h
View file

@ -47,6 +47,9 @@ struct MapEditEvent
MapNode n = CONTENT_AIR;
std::vector<v3s16> modified_blocks; // Represents a set
bool is_private_change = false;
// Setting low_priority to true allows the server
// to send this change to clients with some delay.
bool low_priority = false;
MapEditEvent() = default;

5
src/server.cpp
View file

@ -755,6 +755,7 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
if (!modified_blocks.empty()) {
MapEditEvent event;
event.type = MEET_OTHER;
event.low_priority = true;
event.setModifiedBlocks(modified_blocks);
m_env->getMap().dispatchEvent(event);
}
@ -1006,7 +1007,7 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
}
case MEET_OTHER:
prof.add("MEET_OTHER", 1);
m_clients.markBlocksNotSent(event->modified_blocks);
m_clients.markBlocksNotSent(event->modified_blocks, event->low_priority);
break;
default:
prof.add("unknown", 1);
@ -1022,7 +1023,7 @@ void Server::AsyncRunStep(float dtime, bool initial_step)
*/
for (const u16 far_player : far_players) {
if (RemoteClient *client = getClient(far_player))
client->SetBlocksNotSent(event->modified_blocks);
client->SetBlocksNotSent(event->modified_blocks, event->low_priority);
}
delete event;

14
src/server/clientiface.cpp
View file

@ -422,13 +422,16 @@ void RemoteClient::SentBlock(v3s16 p)
" already in m_blocks_sending"<<std::endl;
}
void RemoteClient::SetBlockNotSent(v3s16 p)
void RemoteClient::SetBlockNotSent(v3s16 p, bool low_priority)
{
m_nothing_to_send_pause_timer = 0;
// remove the block from sending and sent sets,
// and reset the scan loop if found
if (m_blocks_sending.erase(p) + m_blocks_sent.erase(p) > 0) {
// If this is a low priority event, do not reset m_nearest_unsent_d.
// Instead, the send loop will get to the block in the next full loop iteration.
if (!low_priority) {
// Note that we do NOT use the euclidean distance here.
// getNextBlocks builds successive cube-surfaces in the send loop.
// This resets the distance to the maximum cube size that
@ -441,11 +444,12 @@ void RemoteClient::SetBlockNotSent(v3s16 p)
m_nearest_unsent_d = std::min(m_nearest_unsent_d, this_d);
}
}
}
void RemoteClient::SetBlocksNotSent(const std::vector<v3s16> &blocks)
void RemoteClient::SetBlocksNotSent(const std::vector<v3s16> &blocks, bool low_priority)
{
for (v3s16 p : blocks) {
SetBlockNotSent(p);
SetBlockNotSent(p, low_priority);
}
}
@ -664,12 +668,12 @@ std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state)
return reply;
}
void ClientInterface::markBlocksNotSent(const std::vector<v3s16> &positions)
void ClientInterface::markBlocksNotSent(const std::vector<v3s16> &positions, bool low_priority)
{
RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (const auto &client : m_clients) {
if (client.second->getState() >= CS_Active)
client.second->SetBlocksNotSent(positions);
client.second->SetBlocksNotSent(positions, low_priority);
}
}

6
src/server/clientiface.h
View file

@ -251,8 +251,8 @@ public:
void SentBlock(v3s16 p);
void SetBlockNotSent(v3s16 p);
void SetBlocksNotSent(const std::vector<v3s16> &blocks);
void SetBlockNotSent(v3s16 p, bool low_priority = false);
void SetBlocksNotSent(const std::vector<v3s16> &blocks, bool low_priority = false);
/**
* tell client about this block being modified right now.
@ -443,7 +443,7 @@ public:
std::vector<session_t> getClientIDs(ClientState min_state=CS_Active);
/* mark blocks as not sent on all active clients */
void markBlocksNotSent(const std::vector<v3s16> &positions);
void markBlocksNotSent(const std::vector<v3s16> &positions, bool low_priority = false);
/* verify is server user limit was reached */
bool isUserLimitReached();

1
src/servermap.cpp
View file

@ -714,6 +714,7 @@ MapBlock *ServerMap::loadBlock(const std::string &blob, v3s16 p3d, bool save_aft
if (!modified_blocks.empty()) {
MapEditEvent event;
event.type = MEET_OTHER;
event.low_priority = true;
event.setModifiedBlocks(modified_blocks);
dispatchEvent(event);
}