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

fix(Core/Battlegrounds) Rewrite RandomBG and enabling bg/arenas weights (#2516)

Browse Source
This commit is contained in:
Shard
2019-12-28 09:40:13 +01:00
committed by Stoabrogga
parent 5198b2614e
commit 067d9e791f
19 changed files with 210 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2119,7 +2119,7 @@ void Spell::EffectOpenLock(SpellEffIndex effIndex)
// in battleground check
if (Battleground* bg = player->GetBattleground())
{
if (bg->GetBgTypeID() == BATTLEGROUND_EY)
if (bg->GetBgTypeID(true) == BATTLEGROUND_EY)
bg->EventPlayerClickedOnFlag(player, gameObjTarget);
return;
}
@@ -3868,7 +3868,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
case 54640:
{
if (Player* player = unitTarget->ToPlayer())
if (player->GetBattleground() && player->GetBattleground()->GetBgTypeID() == BATTLEGROUND_SA)
if (player->GetBattleground() && player->GetBattleground()->GetBgTypeID(true) == BATTLEGROUND_SA)
{
if (GameObject* dportal = player->FindNearestGameObject(192819, 10.0f))
{

2
src/server/game/Spells/SpellMgr.cpp
View File

@@ -1131,7 +1131,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
return false;
Battleground* bg = player->GetBattleground();
if (!bg || bg->GetBgTypeID() != BATTLEGROUND_IC)
if (!bg || bg->GetBgTypeID(true) != BATTLEGROUND_IC)
return false;
uint8 nodeType = spellId == 68719 ? NODE_TYPE_REFINERY : NODE_TYPE_QUARRY;