Merge branch 'master' into donate_max

lazylier · Nov 10, 2024 · b000471 · b000471
2 parents 7e7d4a7 + e207edf
commit b000471
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mods/ctf/ctf_map/maps b/mods/ctf/ctf_map/maps
diff --git a/mods/other/afkkick/init.lua b/mods/other/afkkick/init.lua
@@ -94,7 +94,7 @@ minetest.register_globalstep(function(dtime)
 			if players[playerName]["lastAction"] + MAX_INACTIVE_TIME - WARN_TIME < currGameTime then
 				minetest.chat_send_player(playerName, minetest.colorize("#FF8C00",
 					S("Warning, you have @1 seconds to move or be kicked",
-				tostring(players[playerName]["lastAction"] + MAX_INACTIVE_TIME - currGameTime + 1))))
+				tostring(math.floor(players[playerName]["lastAction"] + MAX_INACTIVE_TIME - currGameTime + 1)))))
 			end
 		end
 	end
+ −		giant_chess/barriers.data
+21 −0		giant_chess/map.conf
+ −		giant_chess/map.mts
+ −		giant_chess/screenshot.png
+ −		terraria/barriers.data
+24 −0		terraria/map.conf
+ −		terraria/map.mts
+ −		terraria/screenshot.png