Merge git://github.com/TrinityCore/TrinityCore into 4.x

Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt

1 files changed, 33 insertions, 33 deletions

diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index abd8ebbb302..31c05c2723e 100755
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -23,31 +23,31 @@
 Quest::Quest(Field* questRecord)
 {
     Id = questRecord[0].GetUInt32();
-    Method = questRecord[1].GetUInt32();
-    Level = questRecord[2].GetInt32();
-    MinLevel = questRecord[3].GetUInt32();
-    MaxLevel = questRecord[4].GetUInt32();
-    ZoneOrSort = questRecord[5].GetInt32();
-    Type = questRecord[6].GetUInt32();
-    SuggestedPlayers = questRecord[7].GetUInt32();
+    Method = questRecord[1].GetUInt8();
+    Level = questRecord[2].GetInt16();
+    MinLevel = questRecord[3].GetUInt8();
+    MaxLevel = questRecord[4].GetUInt8();
+    ZoneOrSort = questRecord[5].GetInt16();
+    Type = questRecord[6].GetUInt16();
+    SuggestedPlayers = questRecord[7].GetUInt8();
     LimitTime = questRecord[8].GetUInt32();
-    RequiredClasses = questRecord[9].GetUInt32();
-    RequiredRaces = questRecord[10].GetUInt32();
-    RequiredSkillId = questRecord[11].GetUInt32();
-    RequiredSkillPoints = questRecord[12].GetUInt32();
-    RequiredFactionId1 = questRecord[13].GetUInt32();
-    RequiredFactionId2 = questRecord[14].GetUInt32();
+    RequiredClasses = questRecord[9].GetUInt16();
+    RequiredRaces = questRecord[10].GetUInt16();
+    RequiredSkillId = questRecord[11].GetUInt16();
+    RequiredSkillPoints = questRecord[12].GetUInt16();
+    RequiredFactionId1 = questRecord[13].GetUInt16();
+    RequiredFactionId2 = questRecord[14].GetUInt16();
     RequiredFactionValue1 = questRecord[15].GetInt32();
     RequiredFactionValue2 = questRecord[16].GetInt32();
-    RequiredMinRepFaction = questRecord[17].GetUInt32();
-    RequiredMaxRepFaction = questRecord[18].GetUInt32();
+    RequiredMinRepFaction = questRecord[17].GetUInt16();
+    RequiredMaxRepFaction = questRecord[18].GetUInt16();
     RequiredMinRepValue = questRecord[19].GetInt32();
     RequiredMaxRepValue = questRecord[20].GetInt32();
     PrevQuestId = questRecord[21].GetInt32();
     NextQuestId = questRecord[22].GetInt32();
     ExclusiveGroup = questRecord[23].GetInt32();
     NextQuestIdChain = questRecord[24].GetUInt32();
-    RewardXPId = questRecord[25].GetUInt32();
+    RewardXPId = questRecord[25].GetUInt8();
     RewardOrRequiredMoney = questRecord[26].GetInt32();
     RewardMoneyMaxLevel = questRecord[27].GetUInt32();
     RewardSpell = questRecord[28].GetUInt32();
@@ -57,15 +57,15 @@ Quest::Quest(Field* questRecord)
     RewardMailTemplateId = questRecord[32].GetUInt32();
     RewardMailDelay = questRecord[33].GetUInt32();
     SourceItemId = questRecord[34].GetUInt32();
-    SourceItemIdCount = questRecord[35].GetUInt32();
+    SourceItemIdCount = questRecord[35].GetUInt8();
     SourceSpellid = questRecord[36].GetUInt32();
     Flags = questRecord[37].GetUInt32();
-    uint32 SpecialFlags = questRecord[38].GetUInt16();
+    uint32 SpecialFlags = questRecord[38].GetUInt8();
     MinimapTargetMark = questRecord[39].GetUInt32();
-    RewardTitleId = questRecord[40].GetUInt32();
-    RequiredPlayerKills = questRecord[41].GetUInt32();
-    RewardTalents = questRecord[42].GetUInt32();
-    RewardArenaPoints = questRecord[43].GetInt32();
+    RewardTitleId = questRecord[40].GetUInt8();
+    RequiredPlayerKills = questRecord[41].GetUInt8();
+    RewardTalents = questRecord[42].GetUInt8();
+    RewardArenaPoints = questRecord[43].GetUInt16();
     RewardSkillId = questRecord[44].GetUInt32();
     RewardSkillPoints = questRecord[45].GetUInt32();
     RewardReputationMask = questRecord[46].GetUInt32();
@@ -76,16 +76,16 @@ Quest::Quest(Field* questRecord)
         RewardItemId[i] = questRecord[49+i].GetUInt32();
 
     for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
-        RewardItemIdCount[i] = questRecord[53+i].GetUInt32();
+        RewardItemIdCount[i] = questRecord[53+i].GetUInt16();
 
     for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
         RewardChoiceItemId[i] = questRecord[57+i].GetUInt32();
 
     for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
-        RewardChoiceItemCount[i] = questRecord[63+i].GetUInt32();
+        RewardChoiceItemCount[i] = questRecord[63+i].GetUInt16();
 
     for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
-        RewardFactionId[i] = questRecord[69+i].GetUInt32();
+        RewardFactionId[i] = questRecord[69+i].GetUInt16();
 
     for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
         RewardFactionValueId[i] = questRecord[74+i].GetInt32();
@@ -93,7 +93,7 @@ Quest::Quest(Field* questRecord)
     for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
         RewardFactionValueIdOverride[i] = questRecord[79+i].GetInt32();
 
-    PointMapId = questRecord[84].GetUInt32();
+    PointMapId = questRecord[84].GetUInt16();
     PointX = questRecord[85].GetFloat();
     PointY = questRecord[86].GetFloat();
     PointOption = questRecord[87].GetUInt32();
@@ -109,19 +109,19 @@ Quest::Quest(Field* questRecord)
         RequiredNpcOrGo[i] = questRecord[95+i].GetInt32();
 
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
-        RequiredNpcOrGoCount[i] = questRecord[99+i].GetUInt32();
+        RequiredNpcOrGoCount[i] = questRecord[99+i].GetUInt16();
 
     for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
         RequiredSourceItemId[i] = questRecord[103+i].GetUInt32();
 
     for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
-        RequiredSourceItemCount[i] = questRecord[107+i].GetUInt32();
+        RequiredSourceItemCount[i] = questRecord[107+i].GetUInt16();
 
     for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
         RequiredItemId[i] = questRecord[111+i].GetUInt32();
 
     for (int i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
-        RequiredItemCount[i] = questRecord[117+i].GetUInt32();
+        RequiredItemCount[i] = questRecord[117+i].GetUInt16();
 
     RequiredSpell = questRecord[123].GetUInt32();
 
@@ -151,16 +151,16 @@ Quest::Quest(Field* questRecord)
     SoundTurnIn = questRecord[153].GetUInt32();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
-        DetailsEmote[i] = questRecord[154+i].GetUInt32();
+        DetailsEmote[i] = questRecord[154+i].GetUInt16();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
         DetailsEmoteDelay[i] = questRecord[158+i].GetUInt32();
 
-    EmoteOnIncomplete = questRecord[162].GetUInt32();
-    EmoteOnComplete = questRecord[163].GetUInt32();
+    EmoteOnIncomplete = questRecord[162].GetUInt16();
+    EmoteOnComplete = questRecord[163].GetUInt16();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
-        OfferRewardEmote[i] = questRecord[164+i].GetInt32();
+        OfferRewardEmote[i] = questRecord[164+i].GetInt16();
 
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
         OfferRewardEmoteDelay[i] = questRecord[168+i].GetInt32();