Skip to content

Commit 1a561f9

Browse files
extra_logging spaces and fix to player_died (#417)
* extra_logging spaces and fix to player_died * Update extra_logging.lua * Update extra_logging.lua * Update extra_logging.lua * Remove redundant checks --------- Co-authored-by: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
1 parent 6cbc4e5 commit 1a561f9

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

exp_scenario/module/control/extra_logging.lua

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ local function on_pre_player_died(event)
3737
local player = assert(game.get_player(event.player_index))
3838
local cause = event.cause
3939
if cause then
40-
local by_player = event.cause.player
41-
add_log_line("[DEATH]", player.name, "died because of", by_player and by_player.name or event.cause.name)
40+
if cause.type == "character" then
41+
add_log_line("[DEATH]", player.name, "died because of", cause.player.name)
42+
else
43+
add_log_line("[DEATH]", player.name, "died because of", cause.name)
44+
end
4245
else
4346
add_log_line("[DEATH]", player.name, "died because of unknown reason")
4447
end
@@ -52,9 +55,9 @@ local function on_research_finished(event)
5255

5356
local inf_research_level = config_res.inf_res[config_res.mod_set][event.research.name]
5457
if inf_research_level and event.research.level >= inf_research_level then
55-
add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, " at level ", event.research.level - 1, "has been researched\n" }
58+
add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, " at level ", event.research.level - 1, " has been researched\n" }
5659
else
57-
add_log_line_locale{ "", "[RES] ", event.research.prototype.localised_name, "has been researched\n" }
60+
add_log_line_locale{ "", "[RES]", event.research.prototype.localised_name, " has been researched\n" }
5861
end
5962
end
6063

@@ -67,7 +70,7 @@ end
6770
--- @param event EventData.on_player_left_game
6871
local function on_player_left_game(event)
6972
local player = assert(game.get_player(event.player_index))
70-
add_log_line("[LEAVE]", game.players[event.player_index].name, config.disconnect_reason[event.reason])
73+
add_log_line("[LEAVE]", player.name, config.disconnect_reason[event.reason])
7174
end
7275

7376
local e = defines.events

0 commit comments

Comments
 (0)