sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-12-05 00:08:25 +08:00
parent ba56317506 47580c0fab
commit 889b509313
121 changed files with 4818 additions and 1413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Battleground.cpp
+2 -2
View File
@@ -844,7 +844,7 @@ void Battleground::EndBattleground(PvPTeamId winnerTeamId)
TeamId bgTeamId = player->GetBgTeamId();
// should remove spirit of redemption
if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
if (player->HasSpiritOfRedemptionAura())
player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
if (!player->IsAlive())
@@ -1008,7 +1008,7 @@ void Battleground::RemovePlayerAtLeave(Player* player)
RemovePlayer(player);
// should remove spirit of redemption
if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
if (player->HasSpiritOfRedemptionAura())
player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
// if the player was a match participant
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+1 -1
View File
@@ -534,7 +534,7 @@ void BattlegroundSA::TeleportPlayers()
if (Player* player = itr->second)
{
// should remove spirit of redemption
if (player->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
if (player->HasSpiritOfRedemptionAura())
player->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
if (!player->IsAlive())