aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/BattleGroundWS.cpp8
-rw-r--r--src/game/World.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp
index a07c78d0281..12b778a5e47 100644
--- a/src/game/BattleGroundWS.cpp
+++ b/src/game/BattleGroundWS.cpp
@@ -703,13 +703,13 @@ void BattleGroundWS::FillInitialWorldStates(WorldPacket& data)
data << uint32(BG_WS_FLAG_CAPTURES_MAX) << uint32(BG_WS_MAX_TEAM_SCORE);
if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
- data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(2);
+ data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(2);
else
- data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1);
+ data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(1);
if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
- data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(2);
+ data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(2);
else
- data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(1);
+ data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1);
}
diff --git a/src/game/World.cpp b/src/game/World.cpp
index d912e807e87..bba7d1e1e85 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -789,7 +789,7 @@ void World::LoadConfigSettings(bool reload)
if(m_configs[CONFIG_PLAYER_START_ARENAPTS] < 0)
m_configs[CONFIG_PLAYER_START_ARENAPTS] = 0;
- m_configs[CONFIG_GM_START_LEVEL] = sConfig.GetIntDefault("GamemasterStartLevel", 70);
+ m_configs[CONFIG_GM_START_LEVEL] = sConfig.GetIntDefault("GamemasterStartLevel", 1);
if(m_configs[CONFIG_GM_START_LEVEL] < 1)
m_configs[CONFIG_GM_START_LEVEL] = 1;