2 files changed, 4 insertions, 4 deletions

@@ -79,7 +79,7 @@ uint64_t Container::FindOrAddPainting(
   auto it = room_container.find(painting_name);
   if (it == room_container.end()) {
     uint64_t new_id = all_objects_.paintings_size();
-    Painting* painting = all_objects_.add_paintings();
+    PaintingData* painting = all_objects_.add_paintings();
     painting->set_id(new_id);
     painting->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
     painting->set_name(painting_name);
@@ -289,7 +289,7 @@ uint64_t Container::FindOrAddKeyholder(
   auto it = room_container.find(keyholder_name);
   if (it == room_container.end()) {
     uint64_t new_id = all_objects_.keyholders_size();
-    Keyholder* keyholder = all_objects_.add_keyholders();
+    KeyholderData* keyholder = all_objects_.add_keyholders();
     keyholder->set_id(new_id);
     keyholder->set_room_id(FindOrAddRoom(map_name, *room_name, std::nullopt));
     keyholder->set_name(keyholder_name);
@@ -184,7 +184,7 @@ class DataPacker {
     uint64_t painting_id = container_.FindOrAddPainting(
         current_map_name, current_room_name, h_painting.name(), std::nullopt,
         std::nullopt);
-    Painting& painting =
+    PaintingData& painting =
         *container_.all_objects().mutable_paintings(painting_id);
 
     painting.set_path(h_painting.path());
@@ -279,7 +279,7 @@ class DataPacker {
     uint64_t keyholder_id = container_.FindOrAddKeyholder(
         current_map_name, current_room_name, h_keyholder.name(), std::nullopt,
         std::nullopt);
-    Keyholder& keyholder =
+    KeyholderData& keyholder =
         *container_.all_objects().mutable_keyholders(keyholder_id);
 
     keyholder.set_path(h_keyholder.path());