mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-21 06:28:22 +00:00
merge with cls cleanup
This commit is contained in:
@@ -495,7 +495,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
|
|||||||
|
|
||||||
if (!aaType && !bySpellID) {
|
if (!aaType && !bySpellID) {
|
||||||
//LogTestDebug("{}: {} says, 'Attempting {} [{}-{}] on {}'", __LINE__, bot_iter->GetCleanName(), c->GetSpellTypeNameByID(spellType), (subType != UINT16_MAX ? c->GetSubTypeNameByID(subType) : "Standard"), (subTargetType != UINT16_MAX ? c->GetSubTypeNameByID(subTargetType) : "Standard"), (newTar ? newTar->GetCleanName() : "NOBODY")); //deleteme
|
//LogTestDebug("{}: {} says, 'Attempting {} [{}-{}] on {}'", __LINE__, bot_iter->GetCleanName(), c->GetSpellTypeNameByID(spellType), (subType != UINT16_MAX ? c->GetSubTypeNameByID(subType) : "Standard"), (subTargetType != UINT16_MAX ? c->GetSubTypeNameByID(subTargetType) : "Standard"), (newTar ? newTar->GetCleanName() : "NOBODY")); //deleteme
|
||||||
if (!SpellTypeRequiresTarget(spellType, bot_iter->GetClass())) {
|
if (!SpellTypeRequiresTarget(spellType)) {
|
||||||
newTar = bot_iter;
|
newTar = bot_iter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -511,7 +511,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsBotSpellTypeDetrimental(spellType, bot_iter->GetClass()) && !bot_iter->IsAttackAllowed(newTar)) {
|
if (IsBotSpellTypeDetrimental(spellType) && !bot_iter->IsAttackAllowed(newTar)) {
|
||||||
bot_iter->BotGroupSay(
|
bot_iter->BotGroupSay(
|
||||||
bot_iter,
|
bot_iter,
|
||||||
fmt::format(
|
fmt::format(
|
||||||
|
|||||||
Reference in New Issue
Block a user