3 files changed, 6 insertions, 2 deletions
diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp
index 3e16f78..357566a 100644
--- a/tools/assign_ids/main.cpp
+++ b/tools/assign_ids/main.cpp

@@ -111,7 +111,7 @@ class AssignIds {
  void ProcessDoor(const HumanDoor& h_door,
                   const std::string& current_map_name) {
-    if (h_door.type() == DoorType::EVENT) {
+    if (h_door.type() == DoorType::EVENT && !h_door.latch()) {
      return;
    }
diff --git a/tools/datapacker/main.cpp b/tools/datapacker/main.cpp
index 9b487e4..fe520aa 100644
--- a/tools/datapacker/main.cpp
+++ b/tools/datapacker/main.cpp

@@ -431,6 +431,10 @@ class DataPacker {
    if (h_door.has_double_letters()) {
      door.set_double_letters(h_door.double_letters());
    }
+    if (h_door.has_latch()) {
+      door.set_latch(h_door.latch());
+    }
  }
  void ProcessConnectionsFile(std::filesystem::path path,
diff --git a/tools/validator/validator.cpp b/tools/validator/validator.cpp
index c048bab..d651e04 100644
--- a/tools/validator/validator.cpp
+++ b/tools/validator/validator.cpp

@@ -234,7 +234,7 @@ class Validator {
                  << std::endl;
      }
-      bool needs_id = (h_door.type() != DoorType::EVENT);
+      bool needs_id = (h_door.type() != DoorType::EVENT || h_door.latch());
      if (door_info.has_id != needs_id) {
        if (needs_id) {
          std::cout << "Door " << door_identifier.ShortDebugString()