Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Author: Rochet2

src/server/game/DataStores/DBCStores.cpp

@@ -41,7 +41,6 @@ typedef std::map<WMOAreaTableKey, WMOAreaTableEntry const*> WMOAreaInfoByTripple
 
 DBCStorage <AreaTableEntry> sAreaTableStore(AreaTableEntryfmt);
 DBCStorage <AreaGroupEntry> sAreaGroupStore(AreaGroupEntryfmt);
-DBCStorage <AreaPOIEntry> sAreaPOIStore(AreaPOIEntryfmt);
 
 static WMOAreaInfoByTripple sWMOAreaInfoByTripple;
 
@@ -288,7 +287,6 @@ void LoadDBCStores(const std::string& dataPath)
     LOAD_DBC(sAchievementCriteriaStore,           "Achievement_Criteria.dbc");
     LOAD_DBC(sAreaTriggerStore,                   "AreaTrigger.dbc");
     LOAD_DBC(sAreaGroupStore,                     "AreaGroup.dbc");
-    LOAD_DBC(sAreaPOIStore,                       "AreaPOI.dbc");
     LOAD_DBC(sAuctionHouseStore,                  "AuctionHouse.dbc");
     LOAD_DBC(sBankBagSlotPricesStore,             "BankBagSlotPrices.dbc");
     LOAD_DBC(sBannedAddOnsStore,                  "BannedAddOns.dbc");

src/server/game/DataStores/DBCStores.h

@@ -92,7 +92,6 @@ TC_GAME_API extern DBCStorage <AchievementEntry>             sAchievementStore;
 TC_GAME_API extern DBCStorage <AchievementCriteriaEntry>     sAchievementCriteriaStore;
 TC_GAME_API extern DBCStorage <AreaTableEntry>               sAreaTableStore;
 TC_GAME_API extern DBCStorage <AreaGroupEntry>               sAreaGroupStore;
-TC_GAME_API extern DBCStorage <AreaPOIEntry>                 sAreaPOIStore;
 TC_GAME_API extern DBCStorage <AreaTriggerEntry>             sAreaTriggerStore;
 TC_GAME_API extern DBCStorage <AuctionHouseEntry>            sAuctionHouseStore;
 TC_GAME_API extern DBCStorage <BankBagSlotPricesEntry>       sBankBagSlotPricesStore;

src/server/game/Entities/Player/Player.cpp

@@ -6567,7 +6567,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto
         return false;
 
     ObjectGuid victim_guid;
-    uint32 victim_rank = 0;
+    int32 victim_rank = 0;
 
     // need call before fields update to have chance move yesterday data to appropriate fields before today data change.
     UpdateHonorFields();
@@ -6598,26 +6598,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto
             if (v_level <= k_grey)
                 return false;
 
-            // PLAYER_CHOSEN_TITLE VALUES DESCRIPTION
-            //  [0]      Just name
-            //  [1..14]  Alliance honor titles and player name
-            //  [15..28] Horde honor titles and player name
-            //  [29..38] Other title and player name
-            //  [39+]    Nothing
-            uint32 victim_title = victim->GetUInt32Value(PLAYER_CHOSEN_TITLE);
-                                                        // Get Killer titles, CharTitlesEntry::MaskID
-            // Ranks:
-            //  title[1..14]  -> rank[5..18]
-            //  title[15..28] -> rank[5..18]
-            //  title[other]  -> 0
-            if (victim_title == 0)
-                victim_guid.Clear();                     // Don't show HK: <rank> message, only log.
-            else if (victim_title < 15)
-                victim_rank = victim_title + 4;
-            else if (victim_title < 29)
-                victim_rank = victim_title - 14 + 4;
-            else
-                victim_guid.Clear();                     // Don't show HK: <rank> message, only log.
+            victim_rank = victim->GetByteValue(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTES_OFFSET_LIFETIME_MAX_PVP_RANK);
 
             honor_f = std::ceil(Trinity::Honor::hk_honor_at_level_f(k_level) * (v_level - k_grey) / (k_level - k_grey));
 
@@ -6662,7 +6643,7 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto
     WorldPacket data(SMSG_PVP_CREDIT, 4+8+4);
     data << uint32(honor);
     data << victim_guid;
-    data << uint32(victim_rank);
+    data << int32(victim_rank);
 
     SendDirectMessage(&data);
 

src/server/shared/DataStores/DBCStructure.h

@@ -223,24 +223,6 @@ struct AreaGroupEntry
     uint32 NextAreaID;                                      // 7 index of next group
 };
 
-struct AreaPOIEntry
-{
-    uint32 ID;                                              // 0
-    uint32 Importance;                                      // 1
-    uint32 Icon[9];                                         // 2-10
-    uint32 FactionID;                                       // 11
-    DBCPosition3D Pos;                                      // 12-14
-    uint32 ContinentID;                                     // 15
-    //uint32 Flags;                                         // 16
-    uint32 AreaID;                                          // 17
-    //char const* Name[16];                                 // 18-33
-    //uint32 Name_lang_mask;                                // 34
-    //char const* Description[16];                          // 35-50
-    //uint32 Description_lang_mask;                         // 51
-    uint32 WorldStateID;                                    // 52
-    //uint32 WorldMapLink;                                  // 53
-};
-
 struct AreaTriggerEntry
 {
     uint32 ID;                                              // 0

src/server/shared/DataStores/DBCfmt.h

@@ -24,7 +24,6 @@ char constexpr CustomAchievementIndex[] = "ID";
 char constexpr AchievementCriteriafmt[] = "niiiiiiiixxxxxxxxxxxxxxxxxiiiix";
 char constexpr AreaTableEntryfmt[] = "niiiixxxxxissssssssssssssssxiiiiixxx";
 char constexpr AreaGroupEntryfmt[] = "niiiiiii";
-char constexpr AreaPOIEntryfmt[] = "niiiiiiiiiiifffixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxix";
 char constexpr AreaTriggerEntryfmt[] = "niffffffff";
 char constexpr AuctionHouseEntryfmt[] = "niiixxxxxxxxxxxxxxxxx";
 char constexpr BankBagSlotPricesEntryfmt[] = "ni";