From 6910c90fe6e3675f96ef5ae1d56b661d475055ae Mon Sep 17 00:00:00 2001
From: James Osborne <incentive@circlewithadot.net>
Date: Fri, 22 May 2026 22:20:48 -0400
Subject: [PATCH] Lock BB test characters to test ship

---
 src/ReceiveCommands.cc | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index ef4f111d..129808f3 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -2,6 +2,7 @@
 
 #include <inttypes.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <fstream>
 #include <memory>
@@ -66,6 +67,29 @@ static bool mark_bb_character_test(shared_ptr<Client> c) {
   return f.good();
 }
 
+static void clear_bb_ship_state_markers_for_recreated_character(shared_ptr<Client> c) {
+  const string base_filename = c->character_filename();
+  const vector<string> suffixes = {
+      ".hardcore",
+      ".hardcore-dead",
+      ".hardcore-ineligible",
+      ".test",
+      ".test-tainted",
+      ".grandfathered-before-test-taint",
+  };
+
+  for (const auto& suffix : suffixes) {
+    const string filename = base_filename + suffix;
+    if (file_exists_for_bb_taint(filename)) {
+      if (::unlink(filename.c_str()) == 0) {
+        c->log.info_f("Removed stale BB ship-state marker for recreated character: {}", filename);
+      } else {
+        c->log.warning_f("Failed to remove stale BB ship-state marker for recreated character: {}", filename);
+      }
+    }
+  }
+}
+
 static bool enforce_bb_test_ship_lock(shared_ptr<Client> c, bool current_ship_is_test) {
   if (current_ship_is_test) {
     if (!bb_character_is_test(c)) {
@@ -4377,6 +4401,7 @@ static asio::awaitable<void> on_E5_BB(shared_ptr<Client> c, Channel::Message& ms
   } else {
     try {
       auto s = c->require_server_state();
+      clear_bb_ship_state_markers_for_recreated_character(c);
       c->create_character_file(c->login->account->account_id, c->language(), cmd.preview, s->level_table(c->version()));
       if (s->enable_test_mode) {
         if (!mark_bb_character_test(c)) {