From 22f12651782a6a8a6871f20b6423eff8702f8d9e Mon Sep 17 00:00:00 2001 From: nytmyr <53322305+nytmyr@users.noreply.github.com> Date: Sun, 10 Nov 2024 10:13:44 -0600 Subject: [PATCH] remove spelltype checks from clients causing bad data --- zone/bot_database.cpp | 2 +- zone/client.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp index 3f42d995d..60f389a9b 100644 --- a/zone/bot_database.cpp +++ b/zone/bot_database.cpp @@ -2356,7 +2356,7 @@ bool BotDatabase::SaveBotSettings(Mob* m) for (uint16 i = BotSettingCategories::START_CLIENT; i <= BotSettingCategories::END_CLIENT; ++i) { for (uint16 x = BotSpellTypes::START; x <= BotSpellTypes::END; ++x) { LogBotSettings("{} says, 'Checking {} {} [{}] - set to [{}] default [{}].'", m->GetCleanName(), m->CastToBot()->GetBotSpellCategoryName(i), m->CastToBot()->GetSpellTypeNameByID(x), x, m->CastToClient()->GetBotSetting(i, x), m->CastToClient()->GetDefaultBotSettings(i, x)); //deleteme - if (IsClientBotSpellType(x) && m->CastToClient()->GetBotSetting(i, x) != m->CastToClient()->GetDefaultBotSettings(i, x)) { + if (m->CastToClient()->GetBotSetting(i, x) != m->CastToClient()->GetDefaultBotSettings(i, x)) { auto e = BotSettingsRepository::BotSettings{ .char_id = charID, .bot_id = botID, diff --git a/zone/client.cpp b/zone/client.cpp index 176bdaab0..dd22e2a23 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -13087,10 +13087,6 @@ void Client::LoadDefaultBotSettings() { LogBotSettingsDetail("{} says, 'Setting default {} [{}] to [{}]'", GetCleanName(), CastToBot()->GetBotSettingCategoryName(BotBaseSettings::IllusionBlock), BotBaseSettings::IllusionBlock, GetDefaultBotSettings(BotSettingCategories::BaseSetting, BotBaseSettings::IllusionBlock)); //deleteme for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; ++i) { - if (!IsClientBotSpellType(i)) { - continue; - } - BotSpellSettings_Struct t; t.spellType = i;