From 1b0dfb41917c769b2eda5d6b38843c2d066a9ba7 Mon Sep 17 00:00:00 2001
From: Aaron Veden <veden@vedbyte.com>
Date: Fri, 7 Apr 2023 17:54:56 -0700
Subject: [PATCH] FACTO-301: Fixed hivedata cleanup not using hiveId

---
 changelog.txt      | 6 ++++++
 info.json          | 2 +-
 libs/Processor.lua | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index c40e5ff..b813cd3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.3.1
+  Bugfixes:
+    - Fixed hive owned structure cleanup routine from not checking hive id correctly
+
+---------------------------------------------------------------------------------------------------
 Version: 3.3.0
   Improvements:
     - Re-added kamikaze squad state to prevent unit group dancing and then disbanding
diff --git a/info.json b/info.json
index cc42dd4..b189c28 100644
--- a/info.json
+++ b/info.json
@@ -1,7 +1,7 @@
 {
     "name" : "Rampant",
     "factorio_version" : "1.1",
-    "version" : "3.3.0",
+    "version" : "3.3.1",
     "title" : "Rampant",
     "author" : "Veden",
     "homepage" : "https://forums.factorio.com/viewtopic.php?f=94&t=31445",
diff --git a/libs/Processor.lua b/libs/Processor.lua
index 91b4cfd..e9ec9f2 100644
--- a/libs/Processor.lua
+++ b/libs/Processor.lua
@@ -555,7 +555,7 @@ function Processor.cleanHivesData()
     end
 
     Universe.hiveDataIterator = next(Universe.hiveData, entityId)
-    if not Universe.hives[hiveData.id] then
+    if not Universe.hives[hiveData.hiveId] then
         Universe.hiveData[entityId] = nil
     end
 end