From 04b613b95998a631e76062f0cd4d7d11b9d6276e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Grie=C3=9Fhaber?= <jan.griesshaber@gmail.com>
Date: Sat, 3 Jan 2026 17:08:59 +0100
Subject: [PATCH] Fix entity tracking by ensuring last user is checked for
 built and mined entities; update version to 0.1.14

---
 control.lua | 8 ++++++++
 info.json   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/control.lua b/control.lua
index 9ab266a..70d6ce0 100644
--- a/control.lua
+++ b/control.lua
@@ -283,20 +283,24 @@ function CreateEntity(event)
   --Event is RobotPlaced
   if event.name == defines.events.on_robot_built_entity then
     if event.entity.name ~= "entity-ghost" then
+      if event.entity.last_user then
       local lastUser = event.entity.last_user.index
       storage.constructedEntites[lastUser] = storage.constructedEntites[lastUser] or {}
       storage.constructedEntites[lastUser][event.entity.name] = (storage.constructedEntites[lastUser][event.entity.name] or 0) + 1
     end
   end
+  end
 
 
   --Event is spaceplatform build
   if event.name == defines.events.on_space_platform_built_entity then
         if event.entity.name ~= "entity-ghost" then
+          if event.entity.last_user then
       local lastUser = event.entity.last_user.index
       storage.constructedEntites[lastUser] = storage.constructedEntites[lastUser] or {}
       storage.constructedEntites[lastUser][event.entity.name] = (storage.constructedEntites[lastUser][event.entity.name] or 0) + 1
     end
+  end
    end
   UpdateStorage(event)
 
@@ -310,19 +314,23 @@ function RemoveEntity(event)
 
   if event.name == defines.events.on_robot_mined_entity then
     if event.entity.name ~= "entity-ghost" then
+      if event.entity.last_user then
       local lastUser = event.entity.last_user.index
      storage.deconstructedEntities[lastUser] = storage.deconstructedEntities[lastUser] or {}
      storage.deconstructedEntities[lastUser][event.entity.name] = (storage.deconstructedEntities[lastUser][event.entity.name] or 0) + 1
    end
   end
+  end
 
   if event.name == defines.events.on_space_platform_mined_entity then
     if event.entity.name ~= "entity-ghost" then
+      if event.entity.last_user then
       local lastUser = event.entity.last_user.index
       storage.deconstructedEntities[lastUser] = storage.deconstructedEntities[lastUser] or {}
       storage.deconstructedEntities[lastUser][event.entity.name] = (storage.deconstructedEntities[lastUser][event.entity.name] or 0) + 1
     end
   end
+  end
 
   if event.name == defines.events.on_entity_died then
   end
diff --git a/info.json b/info.json
index 2a6e029..59c2ef6 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "factorio-metrics-exporter",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "title": "Prometheus Metrics Exporter",
   "author": "Jan Grießhaber",
   "contact": "jan@griesshaber.systems",