diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 2f8b42556..dbb71d931 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -8409,12 +8409,10 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) FillInitialWorldState(data, count, 0x8d5, 0x0); // 2261 4 FillInitialWorldState(data, count, 0x8d4, 0x0); // 2260 5 FillInitialWorldState(data, count, 0x8d3, 0x0); // 2259 6 - // 3191 7 1 - Arena season in progress, 0 - end of season - // Expected value=8 for this state, not bool 0/1 (as of sept 2010) - FillInitialWorldState(data, count, 0xC77, sWorld.getConfig(CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS)); - // 3901 8 Arena season id - // Expected value=7 for this state (as of sept 2010) - FillInitialWorldState(data, count, 0xF3D, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID)); + // 3191 7 Current arena season + FillInitialWorldState(data, count, 0xC77, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_ID)); + // 3901 8 Previous arena season + FillInitialWorldState(data, count, 0xF3D, sWorld.getConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID)); if(mapid == 530) // Outland { diff --git a/src/game/World.cpp b/src/game/World.cpp index d4042de13..a1903f0b9 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -729,7 +729,7 @@ void World::LoadConfigSettings(bool reload) setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_JOIN, "Arena.QueueAnnouncer.Join", false); setConfig(CONFIG_BOOL_ARENA_QUEUE_ANNOUNCER_EXIT, "Arena.QueueAnnouncer.Exit", false); setConfig(CONFIG_UINT32_ARENA_SEASON_ID, "Arena.ArenaSeason.ID", 1); - setConfig(CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS, "Arena.ArenaSeason.InProgress", true); + setConfig(CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID, "Arena.ArenaSeasonPrevious.ID", 0); setConfigMin(CONFIG_INT32_ARENA_STARTRATING, "Arena.StartRating", -1, -1); setConfigMin(CONFIG_INT32_ARENA_STARTPERSONALRATING, "Arena.StartPersonalRating", -1, -1); diff --git a/src/game/World.h b/src/game/World.h index 8e093edf7..3d10f2148 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -169,6 +169,7 @@ enum eConfigUInt32Values CONFIG_UINT32_ARENA_RATING_DISCARD_TIMER, CONFIG_UINT32_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS, CONFIG_UINT32_ARENA_SEASON_ID, + CONFIG_UINT32_ARENA_SEASON_PREVIOUS_ID, CONFIG_UINT32_CLIENTCACHE_VERSION, CONFIG_UINT32_GUILD_EVENT_LOG_COUNT, CONFIG_UINT32_GUILD_BANK_EVENT_LOG_COUNT, @@ -273,7 +274,6 @@ enum eConfigBoolValues CONFIG_BOOL_GRID_UNLOAD = 0, CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATLY, CONFIG_BOOL_OFFHAND_CHECK_AT_TALENTS_RESET, - CONFIG_BOOL_ARENA_SEASON_IN_PROGRESS, CONFIG_BOOL_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHAT, CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_CHANNEL, diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index 7d911dcc6..d2f1eeb52 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -1414,10 +1414,9 @@ BattleGround.PremadeGroupWaitForMatch = 1800000 # Current area season id show in client # Default: 1 # -# Arena.ArenaSeason.InProgress -# Current area season state -# Default: 1 (active) -# 0 (finished) +# Arena.ArenaSeasonPrevious.ID +# Previous area season id show in client +# Default: 0 # # Arena.StartRating # Default Rating at team creation @@ -1436,7 +1435,7 @@ Arena.AutoDistributeInterval = 7 Arena.QueueAnnouncer.Join = 0 Arena.QueueAnnouncer.Exit = 0 Arena.ArenaSeason.ID = 1 -Arena.ArenaSeason.InProgress = 1 +Arena.ArenaSeasonPrevious.ID = 0 Arena.StartRating = -1 Arena.StartPersonalRating = -1 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 480ab4504..44e943bb4 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10574" + #define REVISION_NR "10575" #endif // __REVISION_NR_H__