Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: mapgen.lua
2016-05-28 09:21:08 -05:00 · 2016-05-28 09:21:08 -05:00 · 285387f1b3
commit 285387f1b3
parent b5088cbffb 67c19e3ee8
1 changed files with 1 additions and 1 deletions
--- a/mapgen.lua
+++ b/mapgen.lua
@ -250,7 +250,7 @@ local function generate(p_minp, p_maxp, seed)

 	-- Deal with memory issues. This, of course, is supposed to be automatic.
 	minetest.after(0, function()
-		if floor(collectgarbage("count")/1024) > 400 then
+		if math.floor(collectgarbage("count")/1024) > 400 then
 			print("Fun Caves: Manually collecting garbage...")
 			collectgarbage("collect")
 		end