nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-29 00:23:48 +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;

1
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
View File

@@ -113,6 +113,7 @@ struct boss_rajaxx : public BossAI
break;
case EVENT_THUNDERCRASH:
DoCastSelf(SPELL_THUNDERCRASH);
me->GetThreatMgr().ResetAllThreat();
events.ScheduleEvent(EVENT_THUNDERCRASH, 21s);
break;
default:

24
src/server/shared/SharedDefines.h
View File

@@ -3418,12 +3418,32 @@ uint8 constexpr PVP_TEAMS_COUNT = 2;
inline PvPTeamId GetPvPTeamId(TeamId teamId)
{
return teamId == TEAM_ALLIANCE ? PVP_TEAM_ALLIANCE : PVP_TEAM_HORDE;
if (teamId == TEAM_ALLIANCE)
{
return PVP_TEAM_ALLIANCE;
}
if (teamId == TEAM_HORDE)
{
return PVP_TEAM_HORDE;
}
return PVP_TEAM_NEUTRAL;
}
inline TeamId GetTeamId(PvPTeamId teamId)
{
return teamId == PVP_TEAM_ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE;
if (teamId == PVP_TEAM_ALLIANCE)
{
return TEAM_ALLIANCE;
}
if (teamId == PVP_TEAM_HORDE)
{
return TEAM_HORDE;
}
return TEAM_NEUTRAL;
}
// indexes of BattlemasterList.dbc