Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix "ghost" blocks if block update is "on wire" while player digs nodes

This commit is contained in:
sapier 2014-07-12 20:20:11 +02:00
parent 247a1ebf23
commit 8e9d896f2d
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/clientiface.cpp
View File

@ -52,6 +52,13 @@ std::string ClientInterface::state2Name(ClientState state)
return statenames[state]; return statenames[state];
} }
void RemoteClient::ResendBlockIfOnWire(v3s16 p)
{
// if this block is on wire, mark it for sending again as soon as possible
if (m_blocks_sending.find(p) != m_blocks_sending.end()) {
SetBlockNotSent(p);
}
}
void RemoteClient::GetNextBlocks( void RemoteClient::GetNextBlocks(
ServerEnvironment *env, ServerEnvironment *env,

8
src/clientiface.h
View File

@ -238,6 +238,14 @@ public:
void SetBlockNotSent(v3s16 p); void SetBlockNotSent(v3s16 p);
void SetBlocksNotSent(std::map<v3s16, MapBlock*> &blocks); void SetBlocksNotSent(std::map<v3s16, MapBlock*> &blocks);
/**
* tell client about this block being modified right now.
* this information is required to requeue the block in case it's "on wire"
* while modification is processed by server
* @param p position of modified block
*/
void ResendBlockIfOnWire(v3s16 p);
s32 SendingCount() s32 SendingCount()
{ {
return m_blocks_sending.size(); return m_blocks_sending.size();

23
src/server.cpp
View File

@ -2545,14 +2545,17 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if(is_valid_dig && n.getContent() != CONTENT_IGNORE) if(is_valid_dig && n.getContent() != CONTENT_IGNORE)
m_script->node_on_dig(p_under, n, playersao); m_script->node_on_dig(p_under, n, playersao);
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
RemoteClient *client = getClient(peer_id);
// Send unusual result (that is, node not being removed) // Send unusual result (that is, node not being removed)
if(m_env->getMap().getNodeNoEx(p_under).getContent() != CONTENT_AIR) if(m_env->getMap().getNodeNoEx(p_under).getContent() != CONTENT_AIR)
{ {
// Re-send block to revert change on client-side // Re-send block to revert change on client-side
RemoteClient *client = getClient(peer_id);
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
client->SetBlockNotSent(blockpos); client->SetBlockNotSent(blockpos);
} }
else {
client->ResendBlockIfOnWire(blockpos);
}
} }
} // action == 2 } // action == 2
@ -2594,15 +2597,21 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// If item has node placement prediction, always send the // If item has node placement prediction, always send the
// blocks to make sure the client knows what exactly happened // blocks to make sure the client knows what exactly happened
if(item.getDefinition(m_itemdef).node_placement_prediction != ""){ RemoteClient *client = getClient(peer_id);
RemoteClient *client = getClient(peer_id); v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_above, BS));
v3s16 blockpos = getNodeBlockPos(floatToInt(pointed_pos_above, BS)); v3s16 blockpos2 = getNodeBlockPos(floatToInt(pointed_pos_under, BS));
if(item.getDefinition(m_itemdef).node_placement_prediction != "") {
client->SetBlockNotSent(blockpos); client->SetBlockNotSent(blockpos);
v3s16 blockpos2 = getNodeBlockPos(floatToInt(pointed_pos_under, BS)); if(blockpos2 != blockpos) {
if(blockpos2 != blockpos){
client->SetBlockNotSent(blockpos2); client->SetBlockNotSent(blockpos2);
} }
} }
else {
client->ResendBlockIfOnWire(blockpos);
if(blockpos2 != blockpos) {
client->ResendBlockIfOnWire(blockpos2);
}
}
} // action == 3 } // action == 3
/* /*