Merge remote-tracking branch 'origin/wip5.7.0' into farmesh5.7.0

proller · Nov 20, 2023 · 546f220 · 546f220
2 parents 294bfc5 + 86d51db
commit 546f220
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ Changelog
 ### 5.7.0.0 (?)
   * Tree growth
   * Weather tuned
+  * Multi protocol network: `cmake -DUSE_MULTI=1` one server for minetest/websocket/enet/sctp clients
+  * Added websocket protocol for serve emscripten builds without proxy `cmake -DENABLE_WEBSOCKET=1`
 
 
 ### 5.6.1.0 (?)

diff --git a/src/server.cpp b/src/server.cpp
@@ -4250,6 +4250,7 @@ v3f Server::findSpawnPos()
 			v3bpos_t blockpos = getNodeBlockPos(nodepos);
 			if (!map.emergeBlock(blockpos, false)) {
 				nodeposf = intToFloat(nodepos, BS);
+				is_good = true;
 				break;
 			}
 			content_t c = map.getNode(nodepos).getContent();