Fixes

map_gen/maps/april_fools/scenario/entity-restrictions.lua

@@ -31,7 +31,7 @@ local function on_built(event)
 
   entity.destroy()
 
-  local stack = event.stack or event.consumed_items.get_contents()[1]
+  local stack = event.stack or event.consumed_items.get_contents()[1] -- TODO: proper handle of consumed_items as LuaInventory
   local player = game.get_player(event.player_index or 'none')
   local robot = event.robot
   if player and player.valid and not ghost and stack.valid then

map_gen/maps/crash_site/scenario.lua

@@ -898,7 +898,7 @@ local function init(config)
                 price = 100,
                 name = 'simple-entity-with-owner',
                 name_label = 'Train Immunity (1x use)',
-                description = 'Each player port in your inventory will save you from being killed by a train once.'
+                description = 'Each train immunity item in your inventory will save you from being killed by a train once.'
             }
         }
     }

map_gen/shared/entity_placement_restriction.lua

@@ -214,7 +214,7 @@ local on_built_token =
 
         local index = event.player_index
 
-        local stack = event.consumed_items.get_contents()[1]
+        local stack = event.consumed_items.get_contents()[1] -- TODO: proper handle of consumed_items as LuaInventory
         raise_event(
             Public.events.on_pre_restricted_entity_destroyed,
             {
@@ -225,7 +225,7 @@ local on_built_token =
             }
         )
 
-        local player = game.get_player(index)
+        local player = game.get_player(index or 'none')
 
         -- Need to revalidate the entity since we sent it to the raised event
         if entity.valid then

utils/global.lua

@@ -1,7 +1,6 @@
 local Event = require 'utils.event_core'
 local Token = require 'utils.token'
 
---local matching_path = '^.+/currently%-playing/(.+)$'
 local matching_path = '^.+__level__/(.+)$'
 
 local Global = {}
@@ -50,10 +49,8 @@ if _DEBUG then
     Global.names = names
 
     function Global.register(tbl, callback)
-        log(debug.getinfo(2, 'S').source)
         local filepath = debug.getinfo(2, 'S').source:match(matching_path):sub(1, -5)
         local token = Token.register_global(tbl)
-        log(filepath)
 
         names[token] = concat {token, ' - ', filepath}
 

utils/gui.lua

@@ -424,7 +424,6 @@ if _DEBUG then
     local names = {}
     Gui.names = names
 
-    --local matching_path = '^.+/currently%-playing/(.+)$'
     local matching_path = '^.+__level__/(.+)$'
 
     function Gui.uid_name()