Merge branch 'aperx' into main

exp_scenario/controller.ts

@@ -1,5 +1,5 @@
 import * as lib from "@clusterio/lib";
-import { BaseControllerPlugin, InstanceInfo } from "@clusterio/controller";
+import { BaseControllerPlugin } from "@clusterio/controller";
 
 export class ControllerPlugin extends BaseControllerPlugin {
 	async init() {

exp_scenario/module/control.lua

@@ -78,6 +78,6 @@ add(require("modules/exp_scenario/gui/production_stats"))
 add(require("modules/exp_scenario/gui/quick_actions"))
 add(require("modules/exp_scenario/gui/readme"))
 add(require("modules/exp_scenario/gui/research_milestones"))
-add(require("modules/exp_scenario/gui/science_production"))
+-- add(require("modules/exp_scenario/gui/science_production"))
 add(require("modules/exp_scenario/gui/surveillance"))
 add(require("modules/exp_scenario/gui/task_list"))

exp_scenario/module/control/extra_logging.lua

@@ -38,7 +38,7 @@ local function on_pre_player_died(event)
     local cause = event.cause
     if cause then
         if cause.type == "character" then
-            add_log_line("[DEATH]", player.name, "died because of", cause.player.name)
+            add_log_line("[DEATH]", player.name, "died because of", (cause.player and cause.player.name) or cause.name)
         else
             add_log_line("[DEATH]", player.name, "died because of", cause.name)
         end