Fire: Disable fire by default in multiplayer

minetest · May 15, 2017 · 758d501 · 758d501
1 parent 63b3542
commit 758d501
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/mods/fire/init.lua b/mods/fire/init.lua
@@ -292,9 +292,14 @@ minetest.register_abm({
 
 local fire_enabled = minetest.setting_getbool("enable_fire")
 if fire_enabled == nil then
-	-- New setting not specified, check for old setting.
-	-- If old setting is also not specified, 'not nil' is true.
-	fire_enabled = not minetest.setting_getbool("disable_fire")
+	-- enable_fire setting not specified, check for disable_fire
+	local fire_disabled = minetest.setting_getbool("disable_fire")
+	if fire_disabled == nil then
+		-- Neither setting specified, check whether singleplayer
+		fire_enabled = minetest.is_singleplayer()
+	else
+		fire_enabled = not fire_disabled
+	end
 end
 
 if not fire_enabled then