nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-27 07:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): code cleanup (part 1) (#6361)

Browse Source
This commit is contained in:
Francesco Borzì
2021-06-16 12:58:14 +02:00
committed by GitHub
parent 7dd97ae679
commit 7d9fe22e28
13 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
View File

@@ -10,7 +10,6 @@
#include "BattlefieldWG.h"
#include "MapManager.h"
#include "ObjectMgr.h"
#include "Opcodes.h"
#include "Player.h"
#include "SpellAuras.h"
@@ -740,27 +739,31 @@ void BattlefieldWG::PromotePlayer(Player* killer)
if (!m_isActive)
return;
// Updating rank of player
if (Aura* aur = killer->GetAura(SPELL_RECRUIT))
if (Aura* recruitAura = killer->GetAura(SPELL_RECRUIT))
{
if (aur->GetStackAmount() >= 5)
if (recruitAura->GetStackAmount() >= 5)
{
killer->RemoveAura(SPELL_RECRUIT);
killer->CastSpell(killer, SPELL_CORPORAL, true);
SendWarningToPlayer(killer, BATTLEFIELD_WG_TEXT_FIRSTRANK);
}
else
{
killer->CastSpell(killer, SPELL_RECRUIT, true);
}
}
else if (Aura* aur = killer->GetAura(SPELL_CORPORAL))
else if (Aura* corporalAura = killer->GetAura(SPELL_CORPORAL))
{
if (aur->GetStackAmount() >= 5)
if (corporalAura->GetStackAmount() >= 5)
{
killer->RemoveAura(SPELL_CORPORAL);
killer->CastSpell(killer, SPELL_LIEUTENANT, true);
SendWarningToPlayer(killer, BATTLEFIELD_WG_TEXT_SECONDRANK);
}
else
{
killer->CastSpell(killer, SPELL_CORPORAL, true);
}
}
}
@@ -990,9 +993,13 @@ void BattlefieldWG::ProcessEvent(WorldObject* obj, uint32 eventId)
if (go->GetEntry() == GO_WINTERGRASP_TITAN_S_RELIC)
{
if (CanInteractWithRelic())
{
EndBattle(false);
else if (GameObject* go = GetRelic())
go->SetRespawnTime(RESPAWN_IMMEDIATELY);
}
else if (GameObject* relic = GetRelic())
{
relic->SetRespawnTime(RESPAWN_IMMEDIATELY);
}
}
// if destroy or damage event, search the wall/tower and update worldstate/send warning message