Merge remote-tracking branch 'origin/wip5.8.0' into wip5.8.0-32

proller · Oct 14, 2024 · eb59792 · eb59792
2 parents 8797a69 + d0f846d
commit eb59792
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/client/fm_far_container.cpp b/src/client/fm_far_container.cpp
@@ -24,8 +24,7 @@ const MapNode &FarContainer::getNodeRefUnsafe(const v3pos_t &pos)
 
 	const auto &storage =
 			m_client->getEnv().getClientMap().far_blocks_storage[fmesh_step];
-	if (const auto &it = storage.find(bpos_aligned); it != storage.end()) {
-		const auto &block = it->second;
+	if (const auto &block = storage.at_or(bpos_aligned)) {
 		v3pos_t relpos = pos - bpos_aligned * MAP_BLOCKSIZE;
 
 		const auto &relpos_shift = fmesh_step; // + 1;

diff --git a/src/threading/concurrent_unordered_map.h b/src/threading/concurrent_unordered_map.h
@@ -71,6 +71,15 @@ class concurrent_unordered_map_ : public std::unordered_map<Key, T, Hash, Pred,
 		return full_type::operator[](std::forward<Args>(args)...);
 	}
 
+	const mapped_type &at_or(const key_type &k, const mapped_type &nothing = {}) const
+	{
+		auto lock = LOCKER::lock_shared_rec();
+		if (const auto it = full_type::find(k); it != full_type::end()) {
+			return it->second;
+		}
+		return nothing;
+	}
+
 	template <typename... Args>
 	decltype(auto) assign(Args &&...args)
 	{

diff --git a/src/threading/concurrent_unordered_set.h b/src/threading/concurrent_unordered_set.h
@@ -36,7 +36,7 @@ class concurrent_unordered_set_ : public std::unordered_set<Value, Hash, Pred, A
 	~concurrent_unordered_set_() { clear(); }
 
 	template <typename... Args>
-	Value &at_or(Args &&...args, const Value &nothing = {})
+	const Value &at_or(Args &&...args, const Value &nothing = {}) const
 	{
 		auto lock = LOCKER::lock_shared_rec();
 		if (const auto it = full_type::find(std::forward<Args>(args)...);