Skip to content

Commit 4fd394b

Browse files
rui914est31
authored andcommittedNov 20, 2015
Log static_spawn error only once
1 parent 2f58e4d commit 4fd394b

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed
 

Diff for: ‎builtin/game/static_spawn.lua

+7-15
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,23 @@
33
local function warn_invalid_static_spawnpoint()
44
if core.setting_get("static_spawnpoint") and
55
not core.setting_get_pos("static_spawnpoint") then
6-
core.log('error', "The static_spawnpoint setting is invalid: \""..
6+
core.log("error", "The static_spawnpoint setting is invalid: \""..
77
core.setting_get("static_spawnpoint").."\"")
88
end
99
end
1010

1111
warn_invalid_static_spawnpoint()
1212

13-
local function put_player_in_spawn(obj)
14-
warn_invalid_static_spawnpoint()
13+
local function put_player_in_spawn(player_obj)
1514
local static_spawnpoint = core.setting_get_pos("static_spawnpoint")
1615
if not static_spawnpoint then
1716
return false
1817
end
19-
core.log('action', "Moving "..obj:get_player_name()..
20-
" to static spawnpoint at "..
21-
core.pos_to_string(static_spawnpoint))
22-
obj:setpos(static_spawnpoint)
18+
core.log("action", "Moving " .. player_obj:get_player_name() ..
19+
" to static spawnpoint at " .. core.pos_to_string(static_spawnpoint))
20+
player_obj:setpos(static_spawnpoint)
2321
return true
2422
end
2523

26-
core.register_on_newplayer(function(obj)
27-
put_player_in_spawn(obj)
28-
end)
29-
30-
core.register_on_respawnplayer(function(obj)
31-
return put_player_in_spawn(obj)
32-
end)
33-
24+
core.register_on_newplayer(put_player_in_spawn)
25+
core.register_on_respawnplayer(put_player_in_spawn)

0 commit comments

Comments
 (0)
Please sign in to comment.