mirror of
https://github.com/mod-playerbots/mod-playerbots
synced 2025-11-29 15:58:20 +08:00
Compare commits
5 Commits
master
...
feature/cr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
afc3bdb8af | ||
|
|
65bd49ce16 | ||
|
|
913039845d | ||
|
|
41b6e70857 | ||
|
|
7cf0ebe328 |
@@ -3321,11 +3321,17 @@ bool PlayerbotAI::CastSpell(uint32 spellId, Unit* target, Item* itemTarget)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!target)
|
if (!bot || !bot->GetSession() || bot->GetSession()->isLogingOut())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!target || !target->IsInWorld() || target->IsDuringRemoveFromWorld())
|
||||||
target = bot;
|
target = bot;
|
||||||
|
|
||||||
Pet* pet = bot->GetPet();
|
Pet* pet = bot->GetPet();
|
||||||
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
|
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId);
|
||||||
|
if (!spellInfo)
|
||||||
|
return false;
|
||||||
|
|
||||||
if (pet && pet->HasSpell(spellId))
|
if (pet && pet->HasSpell(spellId))
|
||||||
{
|
{
|
||||||
// List of spell IDs for which we do NOT want to toggle auto-cast or send message
|
// List of spell IDs for which we do NOT want to toggle auto-cast or send message
|
||||||
@@ -3402,8 +3408,7 @@ bool PlayerbotAI::CastSpell(uint32 spellId, Unit* target, Item* itemTarget)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Spell* spell = new Spell(bot, spellInfo, TRIGGERED_NONE);
|
Spell* spell = new Spell(bot, spellInfo, TRIGGERED_NONE);
|
||||||
|
|
||||||
SpellCastTargets targets;
|
SpellCastTargets targets;
|
||||||
if (spellInfo->Effects[0].Effect != SPELL_EFFECT_OPEN_LOCK &&
|
if (spellInfo->Effects[0].Effect != SPELL_EFFECT_OPEN_LOCK &&
|
||||||
(spellInfo->Targets & TARGET_FLAG_ITEM || spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM))
|
(spellInfo->Targets & TARGET_FLAG_ITEM || spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM))
|
||||||
@@ -3491,8 +3496,31 @@ bool PlayerbotAI::CastSpell(uint32 spellId, Unit* target, Item* itemTarget)
|
|||||||
// if (spellSuccess != SPELL_CAST_OK)
|
// if (spellSuccess != SPELL_CAST_OK)
|
||||||
// return false;
|
// return false;
|
||||||
|
|
||||||
SpellCastResult result = spell->prepare(&targets);
|
|
||||||
|
|
||||||
|
// check if the actual target is valid, spell system uses targets.GetUnitTarget(), GetItemTarget(), GetGOTarget() internally.
|
||||||
|
Unit* uTarget = targets.GetUnitTarget();
|
||||||
|
if (uTarget && (!uTarget->IsInWorld() || uTarget->IsDuringRemoveFromWorld()))
|
||||||
|
{
|
||||||
|
// fail if the spell has a unit target that is invalid or being removed from the world
|
||||||
|
delete spell;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Item* iTarget = targets.GetItemTarget();
|
||||||
|
if (!iTarget && (spellInfo->Targets & (TARGET_FLAG_ITEM | TARGET_FLAG_GAMEOBJECT_ITEM)))
|
||||||
|
{
|
||||||
|
// fail only if the spell requires a specific item or GO item to cast but the bot does not have one
|
||||||
|
delete spell;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
GameObject* gTarget = targets.GetGOTarget();
|
||||||
|
if (gTarget && !gTarget->isSpawned())
|
||||||
|
{
|
||||||
|
// fail if the spell has a GO target that is not spawned or does not exist
|
||||||
|
delete spell;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
SpellCastResult result = spell->prepare(&targets);
|
||||||
if (result != SPELL_CAST_OK)
|
if (result != SPELL_CAST_OK)
|
||||||
{
|
{
|
||||||
// if (!sPlayerbotAIConfig->logInGroupOnly || (bot->GetGroup() && HasRealPlayerMaster())) {
|
// if (!sPlayerbotAIConfig->logInGroupOnly || (bot->GetGroup() && HasRealPlayerMaster())) {
|
||||||
@@ -3552,6 +3580,7 @@ bool PlayerbotAI::CastSpell(uint32 spellId, Unit* target, Item* itemTarget)
|
|||||||
TellMasterNoFacing(out);
|
TellMasterNoFacing(out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delete spell;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// if (spellInfo->Effects[0].Effect == SPELL_EFFECT_OPEN_LOCK || spellInfo->Effects[0].Effect ==
|
// if (spellInfo->Effects[0].Effect == SPELL_EFFECT_OPEN_LOCK || spellInfo->Effects[0].Effect ==
|
||||||
|
|||||||
Reference in New Issue
Block a user