aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/OutdoorPvP
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2015-03-16 07:28:49 +0100
committerRat <gmstreetrat@gmail.com>2015-03-16 07:28:49 +0100
commit8f3a80c1cf39978056979a0bcbcb7321e510c101 (patch)
treefb935f44c86ea9ae84a232f499757b97728e86c4 /src/server/scripts/OutdoorPvP
parent8366ed5a720047102fc44a7ae89adc8ed83f9076 (diff)
Core/Phases: Ported new phasing system from 4.3.4 branch and fixed some map swap logic
Diffstat (limited to 'src/server/scripts/OutdoorPvP')
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
index dd261d4014c..a8da4ff7438 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp
@@ -172,8 +172,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId)
return true;
}
- for (auto phase : player->GetPhases())
- go->SetInPhase(phase, false, true);
+ go->CopyPhaseFrom(player);
go->SetRespawnTime(0);
@@ -209,8 +208,7 @@ bool OutdoorPvPSI::HandleDropFlag(Player* player, uint32 spellId)
return true;
}
- for (auto phase : player->GetPhases())
- go->SetInPhase(phase, false, true);
+ go->CopyPhaseFrom(player);
go->SetRespawnTime(0);