Merge upstream newserv master

2026-05-19 16:56:33 -04:00
parent d7862426ac 86227c0026
commit 47e9fe5f16
45 changed files with 5558 additions and 5132 deletions
@@ -128,6 +128,7 @@ struct ServerState : public std::enable_shared_from_this<ServerState> {
  bool allow_unregistered_users = false;
  bool allow_pc_nte = false;
  bool use_temp_accounts_for_prototypes = true;
+  bool allow_same_account_concurrent_logins = true;
  std::array<uint16_t, NUM_VERSIONS> compatibility_groups = {};
  bool enable_chat_commands = true;
  char chat_command_sentinel = '\0'; // 0 = default (@ on 11/2000; $ on all other versions)
@@ -166,6 +167,7 @@ struct ServerState : public std::enable_shared_from_this<ServerState> {
  bool ep3_jukebox_is_free = false;
  uint32_t ep3_behavior_flags = 0;
  bool hide_download_commands = true;
+  bool censor_credentials = true;
  RunShellBehavior run_shell_behavior = RunShellBehavior::DEFAULT;
  BehaviorSwitch cheat_mode_behavior = BehaviorSwitch::OFF_BY_DEFAULT;
  bool default_switch_assist_enabled = false;
@@ -320,6 +322,8 @@ struct ServerState : public std::enable_shared_from_this<ServerState> {
  uint8_t pre_lobby_event = 0;
  int32_t ep3_menu_song = -1;

+  std::unordered_map<uint32_t, std::shared_ptr<Client>> client_for_account;
+
  std::map<std::string, uint32_t> all_addresses;
  uint32_t local_address = 0;
  uint32_t external_address = 0;