nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-03 11:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-09-01 12:56:06 -06:00
committed by GitHub
parent cd7a22a4de 753d531f22
commit 399b8803b8
6 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/AI/SmartScripts/SmartAI.cpp
View File

@@ -524,7 +524,17 @@ void SmartAI::UpdateAI(uint32 diff)
}
if (!IsAIControlled())
{
if (CharmInfo* charmInfo = me->GetCharmInfo())
{
if (charmInfo->IsCommandAttack() && mCanAutoAttack)
{
DoMeleeAttackIfReady();
}
}
return;
}
if (!UpdateVictim())
return;

1
src/server/game/Battlegrounds/Battleground.h
View File

@@ -99,6 +99,7 @@ enum BattlegroundMarks
{
SPELL_WS_MARK_LOSER = 24950,
SPELL_WS_MARK_WINNER = 24951,
SPELL_WS_MARK_TIE = 66126,
SPELL_AB_MARK_LOSER = 24952,
SPELL_AB_MARK_WINNER = 24953,
SPELL_AV_MARK_LOSER = 24954,

1
src/server/game/Spells/SpellEffects.cpp
View File

@@ -1668,6 +1668,7 @@ void Spell::DoCreateItem(uint8 /*effIndex*/, uint32 itemId)
case SPELL_AV_MARK_LOSER:
case SPELL_WS_MARK_WINNER:
case SPELL_WS_MARK_LOSER:
case SPELL_WS_MARK_TIE:
case SPELL_AB_MARK_WINNER:
case SPELL_AB_MARK_LOSER:
SelfCast = true;