aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-08-27 00:26:02 +0100
committerNay <dnpd.dd@gmail.com>2012-08-27 00:26:02 +0100
commitb26a7337f616016b7c317a1b6fb85161cd9c835d (patch)
tree8cf225de10cff0d72369cbe04b25fc57e739954b /src
parent3fd52c4736a61d1bd32b444429db24b2781f2704 (diff)
Core/Groups: Correction to comment of GROUP_UPDATE_FLAG_PHASE
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Groups/Group.h2
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 5d3bcdd48a3..b32b6b9b77f 100755
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -117,7 +117,7 @@ enum GroupUpdateFlags
GROUP_UPDATE_FLAG_PET_MAX_POWER = 0x00040000, // uint16 (power value)
GROUP_UPDATE_FLAG_PET_AURAS = 0x00080000, // [see GROUP_UPDATE_FLAG_AURAS]
GROUP_UPDATE_FLAG_VEHICLE_SEAT = 0x00100000, // int32 (vehicle seat id)
- GROUP_UPDATE_FLAG_PHASE = 0x00200000, // int32 (unk), uint32 (length), if length > 0, string (size 2*length), else cstring
+ GROUP_UPDATE_FLAG_PHASE = 0x00200000, // int32 (unk), uint32 (phase count), for (count) uint16(phaseId)
GROUP_UPDATE_PET = GROUP_UPDATE_FLAG_PET_GUID | GROUP_UPDATE_FLAG_PET_NAME | GROUP_UPDATE_FLAG_PET_MODEL_ID |
GROUP_UPDATE_FLAG_PET_CUR_HP | GROUP_UPDATE_FLAG_PET_MAX_HP | GROUP_UPDATE_FLAG_PET_POWER_TYPE |
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index c160673ae66..fe7a0eab229 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -1172,7 +1172,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
{
if (!player)
return false;
-
+
if (Battlefield* battlefieldWG = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG))
return battlefieldWG->IsEnabled() && (player->GetTeamId() == battlefieldWG->GetDefenderTeam()) && !battlefieldWG->IsWarTime();
break;