From 7f82beb120e222ace6c258fc3982b5988f9ae070 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Tue, 2 Sep 2025 14:09:35 -0400
Subject: Added keyholder sanity

---
 tools/datapacker/main.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'tools/datapacker/main.cpp')

diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index 5ed82cc..d7e0b69 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp
@@ -293,6 +293,10 @@ class DataPacker {
 
     keyholder.set_path(h_keyholder.path());
 
+    if (h_keyholder.has_key()) {
+      keyholder.set_key(h_keyholder.key());
+    }
+
     return keyholder_id;
   }
 
@@ -592,6 +596,14 @@ class DataPacker {
               .mutable_masteries(mastery_id)
               ->set_ap_id(ap_id);
         }
+
+        for (const auto& [keyholder_name, ap_id] : room.keyholders()) {
+          uint64_t keyholder_id = container_.FindOrAddKeyholder(
+              map_name, room_name, keyholder_name, std::nullopt, std::nullopt);
+          container_.all_objects()
+              .mutable_keyholders(keyholder_id)
+              ->set_ap_id(ap_id);
+        }
       }
     }
 
-- 
cgit 1.4.1