aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2014-11-09 04:25:09 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2014-11-09 04:25:09 +0100
commit2fee7d195bfbabea0cb359582a8232351b6d3bac (patch)
tree288228047aba29ab266c2d291f3bd966cc12d86d /src/server/worldserver
parente8576e5d71e46a535b95f03060c97f274fc20e9e (diff)
Core/NetworkIO: updated SMSG_UPDATE_WORLD_STATE, added SMSG_PVP_SEASON and added packet class for SMSG_INIT_WORLD_STATES
Diffstat (limited to 'src/server/worldserver')
-rw-r--r--src/server/worldserver/Main.cpp1
-rw-r--r--src/server/worldserver/worldserver.conf.dist4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index d4f5c086f4b..821e1f5bd83 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -511,6 +511,7 @@ bool LoadRealmInfo()
realm.Id.Build = fields[11].GetUInt32();
realm.Id.Region = fields[12].GetUInt8();
realm.Id.Battlegroup = fields[13].GetUInt8();
+ return true;
}
/// Initialize connection to the databases
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 3d59b6216f8..e4406e7ecce 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2265,9 +2265,9 @@ Arena.QueueAnnouncer.Enable = 0
#
# Arena.ArenaSeason.ID
# Description: Current arena season id shown in clients.
-# Default: 8
+# Default: 15
-Arena.ArenaSeason.ID = 8
+Arena.ArenaSeason.ID = 15
#
# Arena.ArenaSeason.InProgress