diff options
| author | Jeremy <Golrag@users.noreply.github.com> | 2024-03-28 19:29:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 19:29:22 +0100 |
| commit | be11f42a16d1fa0482e9572bf54e99e4dedd3c78 (patch) | |
| tree | 3d33413d7ed5cada34d7ced7f430380731160d5b /src/server/game/Entities/Player | |
| parent | 78635f640ee3b632a487a50dcf492ae62c2a0933 (diff) | |
Core/Battlegrounds: Move to scripts (#29799)
* Introduce new BattlegroundScript class for map/bg specific scripts
* Remove all sub, zone specific, battleground classes except Arena
* Move all bg zone scripts to new BattlegroundScripts class in script folder
* Remove ZoneScript from Battleground class
* Remove some unused hooks from Battleground
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8473f53ffe2..a24fdcfdd47 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4452,12 +4452,6 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness) UpdateZone(newzone, newarea); sOutdoorPvPMgr->HandlePlayerResurrects(this, newzone); - if (InBattleground()) - { - if (Battleground* bg = GetBattleground()) - bg->HandlePlayerResurrect(this); - } - // update visibility UpdateObjectVisibility(); @@ -4845,9 +4839,7 @@ void Player::RepopAtGraveyard() } WorldSafeLocsEntry const* closestGrave = nullptr; - if (Battleground* bg = GetBattleground()) - closestGrave = bg->GetClosestGraveyard(this); - else if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetMap(), GetZoneId())) + if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(GetMap(), GetZoneId())) closestGrave = bf->GetClosestGraveyard(this); else if (InstanceScript* instance = GetInstanceScript()) closestGrave = sObjectMgr->GetWorldSafeLoc(instance->GetEntranceLocation()); @@ -25368,11 +25360,6 @@ void Player::SummonIfPossible(bool agree) // stop taxi flight at summon FinishTaxiFlight(); - // drop flag at summon - // this code can be reached only when GM is summoning player who carries flag, because player should be immune to summoning spells when he carries flag - if (Battleground* bg = GetBattleground()) - bg->EventPlayerDroppedFlag(this); - m_summon_expire = 0; UpdateCriteria(CriteriaType::AcceptSummon, 1); |
