36 files changed, 19 insertions, 32 deletions
diff --git a/sql/updates/world/2012_10_15_00_world_phase_definitions_434.sql b/sql/old/4.3.4/2012_10_15_00_world_phase_definitions_434.sql
index b8e97278eb5..b8e97278eb5 100644
--- a/sql/updates/world/2012_10_15_00_world_phase_definitions_434.sql
+++ b/sql/old/4.3.4/2012_10_15_00_world_phase_definitions_434.sql
diff --git a/sql/updates/world/2012_10_15_01_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_10_15_01_world_spell_script_names_434.sql
index c3390573bc2..c3390573bc2 100644
--- a/sql/updates/world/2012_10_15_01_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_10_15_01_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_10_15_02_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_10_15_02_world_spell_script_names_434.sql
index d0876fa3cc6..d0876fa3cc6 100644
--- a/sql/updates/world/2012_10_15_02_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_10_15_02_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_11_17_00_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_11_17_00_world_spell_script_names_434.sql
index 13eac8b301e..13eac8b301e 100644
--- a/sql/updates/world/2012_11_17_00_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_11_17_00_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_11_20_00_world_misc_434.sql b/sql/old/4.3.4/2012_11_20_00_world_misc_434.sql
index c0a95134b0a..c0a95134b0a 100644
--- a/sql/updates/world/2012_11_20_00_world_misc_434.sql
+++ b/sql/old/4.3.4/2012_11_20_00_world_misc_434.sql
diff --git a/sql/updates/world/2012_11_21_00_world_misc_434.sql b/sql/old/4.3.4/2012_11_21_00_world_misc_434.sql
index 131dd94585d..131dd94585d 100644
--- a/sql/updates/world/2012_11_21_00_world_misc_434.sql
+++ b/sql/old/4.3.4/2012_11_21_00_world_misc_434.sql
diff --git a/sql/updates/world/2012_11_22_00_world_command_434.sql b/sql/old/4.3.4/2012_11_22_00_world_command_434.sql
index 41da2d208b7..41da2d208b7 100644
--- a/sql/updates/world/2012_11_22_00_world_command_434.sql
+++ b/sql/old/4.3.4/2012_11_22_00_world_command_434.sql
diff --git a/sql/updates/world/2012_11_25_02_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_11_25_02_world_spell_script_names_434.sql
index f0dd277cc96..f0dd277cc96 100644
--- a/sql/updates/world/2012_11_25_02_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_11_25_02_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_12_01_00_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_12_01_00_world_spell_script_names_434.sql
index bd13cb8ef9d..bd13cb8ef9d 100644
--- a/sql/updates/world/2012_12_01_00_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_12_01_00_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_12_02_00_world_spell_group_misc_434.sql b/sql/old/4.3.4/2012_12_02_00_world_spell_group_misc_434.sql
index 52e6a041f2e..52e6a041f2e 100644
--- a/sql/updates/world/2012_12_02_00_world_spell_group_misc_434.sql
+++ b/sql/old/4.3.4/2012_12_02_00_world_spell_group_misc_434.sql
diff --git a/sql/updates/world/2012_12_24_00_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_12_24_00_world_spell_script_names_434.sql
index d95da8f3239..d95da8f3239 100644
--- a/sql/updates/world/2012_12_24_00_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_12_24_00_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_12_24_09_world_halls_of_origination_434.sql b/sql/old/4.3.4/2012_12_24_09_world_halls_of_origination_434.sql
index 940f3407f23..940f3407f23 100644
--- a/sql/updates/world/2012_12_24_09_world_halls_of_origination_434.sql
+++ b/sql/old/4.3.4/2012_12_24_09_world_halls_of_origination_434.sql
diff --git a/sql/updates/world/2012_12_25_01_world_halls_of_origination_434.sql b/sql/old/4.3.4/2012_12_25_01_world_halls_of_origination_434.sql
index 7b2cd1a7245..7b2cd1a7245 100644
--- a/sql/updates/world/2012_12_25_01_world_halls_of_origination_434.sql
+++ b/sql/old/4.3.4/2012_12_25_01_world_halls_of_origination_434.sql
diff --git a/sql/updates/world/2012_12_26_00_world_spell_script_names_434.sql b/sql/old/4.3.4/2012_12_26_00_world_spell_script_names_434.sql
index c1c7a8db271..c1c7a8db271 100644
--- a/sql/updates/world/2012_12_26_00_world_spell_script_names_434.sql
+++ b/sql/old/4.3.4/2012_12_26_00_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2012_12_27_00_world_spelldifficulty_dbc_434.sql b/sql/old/4.3.4/2012_12_27_00_world_spelldifficulty_dbc_434.sql
index 569e6eb7178..569e6eb7178 100644
--- a/sql/updates/world/2012_12_27_00_world_spelldifficulty_dbc_434.sql
+++ b/sql/old/4.3.4/2012_12_27_00_world_spelldifficulty_dbc_434.sql
diff --git a/sql/updates/world/2012_12_27_01_world_achievement_dbc_434.sql b/sql/old/4.3.4/2012_12_27_01_world_achievement_dbc_434.sql
index 8229f489add..8229f489add 100644
--- a/sql/updates/world/2012_12_27_01_world_achievement_dbc_434.sql
+++ b/sql/old/4.3.4/2012_12_27_01_world_achievement_dbc_434.sql
diff --git a/sql/updates/world/2012_12_30_00_world_zul_gurub_434.sql b/sql/old/4.3.4/2012_12_30_00_world_zul_gurub_434.sql
index 5b4e31636db..5b4e31636db 100644
--- a/sql/updates/world/2012_12_30_00_world_zul_gurub_434.sql
+++ b/sql/old/4.3.4/2012_12_30_00_world_zul_gurub_434.sql
diff --git a/sql/updates/world/2013_01_03_00_world_spell_area_434.sql b/sql/old/4.3.4/2013_01_03_00_world_spell_area_434.sql
index 207b51f9f7b..207b51f9f7b 100644
--- a/sql/updates/world/2013_01_03_00_world_spell_area_434.sql
+++ b/sql/old/4.3.4/2013_01_03_00_world_spell_area_434.sql
diff --git a/sql/updates/world/2013_01_03_01_world_spell_area_434.sql b/sql/old/4.3.4/2013_01_03_01_world_spell_area_434.sql
index 2eb36926193..2eb36926193 100644
--- a/sql/updates/world/2013_01_03_01_world_spell_area_434.sql
+++ b/sql/old/4.3.4/2013_01_03_01_world_spell_area_434.sql
diff --git a/sql/updates/world/2013_01_04_00_world_halls_of_origination_434.sql b/sql/old/4.3.4/2013_01_04_00_world_halls_of_origination_434.sql
index 36df0da72ca..36df0da72ca 100644
--- a/sql/updates/world/2013_01_04_00_world_halls_of_origination_434.sql
+++ b/sql/old/4.3.4/2013_01_04_00_world_halls_of_origination_434.sql
diff --git a/sql/updates/world/2013_01_05_00_world_firelands_434.sql b/sql/old/4.3.4/2013_01_05_00_world_firelands_434.sql
index fa20d425209..fa20d425209 100644
--- a/sql/updates/world/2013_01_05_00_world_firelands_434.sql
+++ b/sql/old/4.3.4/2013_01_05_00_world_firelands_434.sql
diff --git a/sql/updates/world/2013_01_21_00_world_misc_434.sql b/sql/old/4.3.4/2013_01_21_00_world_misc_434.sql
index 058a574ca93..058a574ca93 100644
--- a/sql/updates/world/2013_01_21_00_world_misc_434.sql
+++ b/sql/old/4.3.4/2013_01_21_00_world_misc_434.sql
diff --git a/sql/updates/world/2013_01_21_01_world_misc_434.sql b/sql/old/4.3.4/2013_01_21_01_world_misc_434.sql
index dcf058b44e0..dcf058b44e0 100644
--- a/sql/updates/world/2013_01_21_01_world_misc_434.sql
+++ b/sql/old/4.3.4/2013_01_21_01_world_misc_434.sql
diff --git a/sql/updates/world/2013_01_22_00_world_spell_proc_event_434.sql b/sql/old/4.3.4/2013_01_22_00_world_spell_proc_event_434.sql
index 036864683ea..036864683ea 100644
--- a/sql/updates/world/2013_01_22_00_world_spell_proc_event_434.sql
+++ b/sql/old/4.3.4/2013_01_22_00_world_spell_proc_event_434.sql
diff --git a/sql/updates/world/2013_01_24_00_world_instance_template.sql b/sql/updates/world/2013_01_24_00_world_instance_template.sql
new file mode 100644
index 00000000000..23a0ffb04b8
--- /dev/null
+++ b/sql/updates/world/2013_01_24_00_world_instance_template.sql
@@ -0,0 +1 @@
+UPDATE `instance_template` SET `script`='instance_baradin_hold' WHERE `map`=757;
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
index 3dd8e01ad72..445d1295629 100644
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@@ -938,13 +938,13 @@ void Battleground::EndBattleground(uint32 winner)
                 UpdatePlayerScore(player, SCORE_BONUS_HONOR, GetBonusHonorFromKill(winner_kills));
                 if (!player->GetRandomWinner())
                 {
-                    // 100cp awarded for the first rated battleground won each day
-                    player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_BG, BG_REWARD_WINNER_CONQUEST_FIRST);
+                    // 100cp awarded for the first random battleground won each day
+                    player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, BG_REWARD_WINNER_CONQUEST_FIRST);
                     player->SetRandomWinner(true);
                 }
             }
             else // 50cp awarded for each non-rated battleground won
-                player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_BG, BG_REWARD_WINNER_CONQUEST_LAST );
+                player->ModifyCurrency(CURRENCY_TYPE_CONQUEST_META_ARENA, BG_REWARD_WINNER_CONQUEST_LAST);
 
             player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_BG, 1);
             if (!guildAwarded)
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index d7ccaae9355..347e5f90916 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -530,7 +530,7 @@ enum CurrencyTypes
     CURRENCY_TYPE_JUSTICE_POINTS        = 395,
     CURRENCY_TYPE_VALOR_POINTS          = 396,
     CURRENCY_TYPE_CONQUEST_META_ARENA   = 483,
-    CURRENCY_TYPE_CONQUEST_META_BG      = 484,
+    CURRENCY_TYPE_CONQUEST_META_RBG     = 484,
 };
 
 #endif
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 89cab7d5744..1fe980f60b5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7342,9 +7342,9 @@ void Player::SendPvpRewards() const
     packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_POINTS, true);
     packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_ARENA, true);
     packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_ARENA, true);
-    packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_BG, true);
+    packet << GetCurrencyOnWeek(CURRENCY_TYPE_CONQUEST_META_RBG, true);
     packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_POINTS, true);
-    packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_BG, true);
+    packet << GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true);
     GetSession()->SendPacket(&packet);
 }
 
@@ -7559,7 +7559,7 @@ uint32 Player::_GetCurrencyWeekCap(const CurrencyTypesEntry* currency) const
         case CURRENCY_TYPE_CONQUEST_META_ARENA:
             // should add precision mod = 100
             return Trinity::Currency::ConquestRatingCalculator(_maxPersonalArenaRate) * CURRENCY_PRECISION;
-        case CURRENCY_TYPE_CONQUEST_META_BG:
+        case CURRENCY_TYPE_CONQUEST_META_RBG:
             // should add precision mod = 100
             return Trinity::Currency::BgConquestRatingCalculator(GetRBGPersonalRating()) * CURRENCY_PRECISION;
     }
diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp
index 7dfc8b94090..71c5da9af2b 100644
--- a/src/server/game/Handlers/BattleGroundHandler.cpp
+++ b/src/server/game/Handlers/BattleGroundHandler.cpp
@@ -792,7 +792,7 @@ void WorldSession::HandleRequestRatedBgInfo(WorldPacket & recvData)
     uint8 unk;
     recvData >> unk;
 
-    sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleRequestRatedBgInfo: get unk = %u", unk);
+    sLog->outDebug(LOG_FILTER_BATTLEGROUND, "WorldSession::HandleRequestRatedBgInfo: unk = %u", unk);
 
     /// @Todo: perfome research in this case
     /// The unk fields are related to arenas
@@ -852,7 +852,7 @@ void WorldSession::HandleRequestRatedBgStats(WorldPacket& /*recvData*/)
     data << uint8(3);   // unk
     data << uint32(0);  // unk
     data << uint32(0);  // unk
-    data << _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_BG, true);
+    data << _player->GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, true);
     data << uint32(0);  // unk
     data << uint32(0);  // unk
     data << _player->GetCurrency(CURRENCY_TYPE_CONQUEST_POINTS, true);
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index 89dbe03703a..1105886813a 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -583,10 +583,10 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recvData)
         case CHAT_MSG_GUILD:
         case CHAT_MSG_BATTLEGROUND:
         {
-            uint32 prefixLen = recvData.ReadBits(5);
             uint32 msgLen = recvData.ReadBits(9);
-            prefix = recvData.ReadString(prefixLen);
+            uint32 prefixLen = recvData.ReadBits(5);
             message = recvData.ReadString(msgLen);
+            prefix = recvData.ReadString(prefixLen);
             break;
         }
         default:
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 507e755ce9d..2619ef0eeb6 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -5068,20 +5068,6 @@ SpellCastResult Spell::CheckCast(bool strict)
         }
     }
 
-    // Updated 4.3.4. Dispel effects can always be cast (even when there's nothing to dispel).
-    /*
-    if (!hasNonDispelEffect && !hasDispellableAura && dispelMask && !IsTriggered())
-    {
-        if (Unit* target = m_targets.GetUnitTarget())
-        {
-            DispelChargesList dispelList;
-            target->GetDispellableAuraList(m_caster, dispelMask, dispelList);
-            if (dispelList.empty())
-                return SPELL_FAILED_NOTHING_TO_DISPEL;
-        }
-    }
-    */
-
     for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
     {
         // for effects of spells that have only one target
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 6f76363cf84..4b027e9ebbf 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -844,11 +844,11 @@ void World::LoadConfigSettings(bool reload)
     }
     m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_WEEK_CAP] *= 100;     //precision mod
 
-    m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = ConfigMgr::GetIntDefault("Currency.ConquestPointsArenaReward", 150);
+    m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = ConfigMgr::GetIntDefault("Currency.ConquestPointsArenaReward", 180);
     if (int32(m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD]) <= 0)
     {
         sLog->outError(LOG_FILTER_SERVER_LOADING, "Currency.ConquestPointsArenaReward (%i) must be > 0, set to default 180.", m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD]);
-        m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = 150;
+        m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] = 180;
     }
     m_int_configs[CONFIG_CURRENCY_CONQUEST_POINTS_ARENA_REWARD] *= 100;     //precision mod
 
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index e89067e3892..64110c8a8ce 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
@@ -211,7 +211,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
 
     PrepareStatement(CHAR_INS_GUILD_MEMBER_WITHDRAW,
                      "INSERT INTO guild_member_withdraw (guid, tab0, tab1, tab2, tab3, tab4, tab5, tab6, tab7, money) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) "
-                     "ON DUPLICATE KEY UPDATE tab0 = VALUES (tab0), tab1 = VALUES (tab1), tab2 = VALUES (tab2), tab3 = VALUES (tab3), tab4 = VALUES (tab4), tab5 = VALUES (tab5), tab6 = VALUES (tab6), tab7 = VALUES (tab7)", CONNECTION_ASYNC);
+                     "ON DUPLICATE KEY UPDATE tab0 = VALUES (tab0), tab1 = VALUES (tab1), tab2 = VALUES (tab2), tab3 = VALUES (tab3), tab4 = VALUES (tab4), tab5 = VALUES (tab5), tab6 = VALUES (tab6), tab7 = VALUES (tab7), money = VALUES (money)", CONNECTION_ASYNC);
     PrepareStatement(CHAR_DEL_GUILD_MEMBER_WITHDRAW, "TRUNCATE guild_member_withdraw", CONNECTION_ASYNC);
 
     // 0: uint32, 1: uint32, 2: uint32
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index af8f61ce7f3..f241b4d1b23 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2942,10 +2942,10 @@ Currency.ConquestPointsDefaultWeekCap = 1350
 #
 #    Currency.ConquestPointsArenaReward
 #        Amount of conquest points rewarded by winning arenas
-#        Default: 150
+#        Default: 180
 #
 
-Currency.ConquestPointsArenaReward = 150
+Currency.ConquestPointsArenaReward = 180
 
 #
 ###################################################################################################
diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index f5439076e93..201f32ab630 100644
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -15,7 +15,7 @@ file(GLOB_RECURSE sources *.cpp *.h)
 add_definitions("-DIOMAP_DEBUG")
 
 # build setup currently only supports libmpq 0.4.x
-if( NOT WIN32 )
+if( NOT MSVC )
   add_definitions("-Wall")
   add_definitions("-ggdb")
   add_definitions("-O3")
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index c1af5b5788d..3e503259c83 100644
--- a/src/tools/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
@@ -37,7 +37,7 @@ WDTFile::WDTFile(char* file_name, char* file_name1):WDT(WorldMpq, file_name)
     filename.append(file_name1,strlen(file_name1));
 }
 
-bool WDTFile::init(char */*map_id*/, unsigned int mapID)
+bool WDTFile::init(char* /*map_id*/, unsigned int mapID)
 {
     if (WDT.isEof())
     {