diff --git a/zone/bot.cpp b/zone/bot.cpp index e750ecc16..3865360b6 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -4003,6 +4003,21 @@ bool Bot::Spawn(Client* botCharacterOwner) { m_targetable = true; entity_list.AddBot(this, true, true); + + GetBotOwnerDataBuckets(); + GetBotDataBuckets(); + LoadBotSpellSettings(); + if (!AI_AddBotSpells(GetBotSpellID())) { + GetBotOwner()->CastToClient()->Message( + Chat::White, + fmt::format( + "Failed to load spells for '{}' (ID {}).", + GetCleanName(), + GetBotID() + ).c_str() + ); + } + // Load pet LoadPet(); SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0); diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp index fcea1446c..0d5029544 100644 --- a/zone/bot_command.cpp +++ b/zone/bot_command.cpp @@ -6686,20 +6686,6 @@ void bot_subcommand_bot_spawn(Client *c, const Seperator *sep) return; } - my_bot->GetBotOwnerDataBuckets(); - my_bot->GetBotDataBuckets(); - my_bot->LoadBotSpellSettings(); - if (!my_bot->AI_AddBotSpells(my_bot->GetBotSpellID())) { - c->Message( - Chat::White, - fmt::format( - "Failed to load spells for '{}' (ID {}).", - bot_name, - bot_id - ).c_str() - ); - } - static std::string bot_spawn_message[17] = { "I am ready to fight!", // DEFAULT "A solid weapon is my ally!", // WARRIOR