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

proller · Mar 9, 2024 · d7b1b1d · d7b1b1d
2 parents fa7ecf2 + a9ae9e8
commit d7b1b1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -627,10 +627,10 @@ add_subdirectory(server)
 OPTION(ENABLE_SCTP "Enable SCTP networking (EXPERIMENTAL, not compatible with other)" 0)
 OPTION(USE_MULTI "Enable MT+SCTP networking" 0)
 if(USE_MULTI)
-	set(ENABLE_SCTP 1)
-	set(ENABLE_ENET 1)
-	#set(ENABLE_WEBSOCKET_SCTP 1) # NOT FINISHED
-	set(ENABLE_WEBSOCKET 1)
+	set(ENABLE_SCTP 1 CACHE BOOL "")
+	set(ENABLE_ENET 1 CACHE BOOL "")
+	#set(ENABLE_WEBSOCKET_SCTP 1 CACHE BOOL "") # NOT FINISHED
+	set(ENABLE_WEBSOCKET 1 CACHE BOOL "")
 endif()
 
 
@@ -642,8 +642,11 @@ if(ENABLE_WEBSOCKET OR ENABLE_WEBSOCKET_SCTP)
 	message(STATUS "Using websocket: ${CMAKE_CURRENT_SOURCE_DIR}/external/websocketpp")
 	find_package(OpenSSL)
 	set(WEBSOCKETPP_LIBRARY ${WEBSOCKETPP_LIBRARY} OpenSSL::SSL)
-        set(USE_WEBSOCKET 1)
-	#TODO: set(USE_WEBSOCKET_SCTP 1)
+	set(USE_WEBSOCKET 1 CACHE BOOL "")
+	#TODO: set(USE_WEBSOCKET_SCTP 1 CACHE BOOL "")
+    else()
+	set(USE_WEBSOCKET 0)
+	set(USE_WEBSOCKET_SCTP 0)
     endif()
 endif()
 

diff --git a/src/content_abm.cpp b/src/content_abm.cpp
@@ -319,9 +319,9 @@ class BurnHot : public ActiveBlockModifier
 		ServerMap *map = &env->getServerMap();
 		const auto heat = map->updateBlockHeat(env, p);
 
-		if (heat < 1000 - flammable * 200)
+		if (heat < 600 - flammable * 50)
 			return;
-DUMP("fire", p, n);
+
 		map->setNode(p, ndef->getId("fire:basic_flame"));
 		env->nodeUpdate(p, 2);
 	}