diff options
| -rw-r--r-- | src/map.cpp | 9 | ||||
| -rw-r--r-- | src/server.cpp | 14 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/map.cpp b/src/map.cpp index 2ccd6fd1c..ebf443818 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2214,20 +2214,15 @@ void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max, continue; bool block_data_inexistent = false; - try { TimeTaker timer2("emerge load", &emerge_load_time); - block = m_map->getBlockNoCreate(p); - if(block->isDummy()) + block = m_map->getBlockNoCreateNoEx(p); + if (!block || block->isDummy()) block_data_inexistent = true; else block->copyTo(*this); } - catch(InvalidPositionException &e) - { - block_data_inexistent = true; - } if(block_data_inexistent) { diff --git a/src/server.cpp b/src/server.cpp index 386817c8f..82c83e47d 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2287,16 +2287,15 @@ void Server::SendBlocks(float dtime) g_settings->getU32("max_simultaneous_block_sends_per_client") / 4 + 1; ScopeProfiler sp(g_profiler, "Server::SendBlocks(): Send to clients"); + Map &map = m_env->getMap(); + for (const PrioritySortedBlockTransfer &block_to_send : queue) { if (total_sending >= max_blocks_to_send) break; - MapBlock *block = nullptr; - try { - block = m_env->getMap().getBlockNoCreate(block_to_send.pos); - } catch (const InvalidPositionException &e) { + MapBlock *block = map.getBlockNoCreateNoEx(block_to_send.pos); + if (!block) continue; - } RemoteClient *client = m_clients.lockedGetClientNoEx(block_to_send.peer_id, CS_Active); @@ -2314,10 +2313,7 @@ void Server::SendBlocks(float dtime) bool Server::SendBlock(session_t peer_id, const v3s16 &blockpos) { - MapBlock *block = nullptr; - try { - block = m_env->getMap().getBlockNoCreate(blockpos); - } catch (InvalidPositionException &e) {}; + MapBlock *block = m_env->getMap().getBlockNoCreateNoEx(blockpos); if (!block) return false; |