Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

Author: Rochet2

sql/updates/world/3.3.5/2025_09_27_00_world.sql

@@ -0,0 +1,5 @@
+--
+DELETE FROM `pool_members` WHERE `type`=1 AND `spawnId` IN (163412,163812,164212);
+DELETE FROM `pool_members` WHERE `type`=2 AND `spawnId`=11612;
+DELETE FROM `spawn_group` WHERE `spawnType`=1 AND `spawnId` IN (163412,163812,164212);
+DELETE FROM `gameobject` WHERE `guid` IN (163412,163812,164212);

sql/updates/world/3.3.5/2025_09_27_01_world.sql

@@ -0,0 +1,2 @@
+-- Spirit Healer (Area: Howling Fjord - Difficulty: 0)
+UPDATE `creature` SET `position_x`=1347.5555419921875, `position_y`=-4786.142578125, `position_z`=188.2603302001953125, `orientation`=3.054326057434082031 WHERE `guid`=125652 and `id`=6491;

sql/updates/world/3.3.5/2025_09_27_02_world.sql

@@ -0,0 +1,10 @@
+-- Add proper conditions for Jesse Masters <Butcher>
+UPDATE `gossip_menu` SET `VerifiedBuild`=63305 WHERE `MenuID`=9798 AND `TextID`=13503;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (14,15,23) AND `SourceGroup` IN (9798,29244) AND `SourceEntry` IN (0,13502,13503,33454,40202);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14, 9798, 13502, 0, 0, 47, 0, 12212, 64, 0, 1, 0, 0, '', "Show gossip menu if player does not have quest 'Replenishing the Storehouse' rewarded"),
+(14, 9798, 13503, 0, 0, 47, 0, 12212, 64, 0, 0, 0, 0, '', "Show gossip menu if player has quest 'Replenishing the Storehouse' rewarded"),
+(15, 9798, 0, 0, 0, 47, 0, 12212, 64, 0, 0, 0, 0, '', "Show gossip menu if player has quest 'Replenishing the Storehouse' rewarded"),
+(23, 29244, 33454, 0, 0, 47, 0, 12212, 64, 0, 0, 0, 0, '', "Sell Salted Venison if player has quest 'Replenishing the Storehouse' rewarded"),
+(23, 29244, 40202, 0, 0, 47, 0, 12216, 64, 0, 0, 0, 0, '', "Sell Sizzling Grizzly Flank if player has quest 'Take Their Rear!' rewarded");

sql/updates/world/3.3.5/2025_09_27_03_world.sql

@@ -0,0 +1,2 @@
+-- Spirit Healer (Area: Grizzly Hills - Difficulty: 0)
+UPDATE `creature` SET `position_x`=3529.45068359375, `position_y`=-2892.474853515625, `position_z`=204.703369140625, `orientation`=1.256637096405029296 WHERE `guid`=125676 and `id`=6491;

…ryptography/Authentication/AuthCrypt.cpp …aphy/Authentication/WorldPacketCrypt.cppsrc/common/Cryptography/Authentication/AuthCrypt.cpp renamed to src/common/Cryptography/Authentication/WorldPacketCrypt.cpp src/common/Cryptography/Authentication/AuthCrypt.cpp renamed to src/common/Cryptography/Authentication/WorldPacketCrypt.cpp

@@ -15,18 +15,15 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AuthCrypt.h"
-#include "BigNumber.h"
+#include "WorldPacketCrypt.h"
 #include "Errors.h"
 #include "HMAC.h"
 
-#include <cstring>
-
-AuthCrypt::AuthCrypt() :
-    _initialized(false)
-{ }
+WorldPacketCrypt::WorldPacketCrypt() : _initialized(false)
+{
+}
 
-void AuthCrypt::Init(SessionKey const& K)
+void WorldPacketCrypt::Init(SessionKey const& K)
 {
     uint8 ServerEncryptionKey[] = { 0xCC, 0x98, 0xAE, 0x04, 0xE8, 0x97, 0xEA, 0xCA, 0x12, 0xDD, 0xC0, 0x93, 0x42, 0x91, 0x53, 0x57 };
     _serverEncrypt.Init(Trinity::Crypto::HMAC_SHA1::GetDigestOf(ServerEncryptionKey, K));
@@ -41,13 +38,13 @@ void AuthCrypt::Init(SessionKey const& K)
     _initialized = true;
 }
 
-void AuthCrypt::DecryptRecv(uint8 *data, size_t len)
+void WorldPacketCrypt::DecryptRecv(uint8 *data, size_t len)
 {
     ASSERT(_initialized);
     _clientDecrypt.UpdateData(data, len);
 }
 
-void AuthCrypt::EncryptSend(uint8 *data, size_t len)
+void WorldPacketCrypt::EncryptSend(uint8 *data, size_t len)
 {
     ASSERT(_initialized);
     _serverEncrypt.UpdateData(data, len);

…/Cryptography/Authentication/AuthCrypt.h …graphy/Authentication/WorldPacketCrypt.hsrc/common/Cryptography/Authentication/AuthCrypt.h renamed to src/common/Cryptography/Authentication/WorldPacketCrypt.h src/common/Cryptography/Authentication/AuthCrypt.h renamed to src/common/Cryptography/Authentication/WorldPacketCrypt.h

@@ -15,27 +15,27 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _AUTHCRYPT_H
-#define _AUTHCRYPT_H
+#ifndef _WORLDPACKETCRYPT_H
+#define _WORLDPACKETCRYPT_H
 
 #include "ARC4.h"
 #include "AuthDefines.h"
-#include <array>
 
-class TC_COMMON_API AuthCrypt
+class TC_COMMON_API WorldPacketCrypt
 {
-    public:
-        AuthCrypt();
+public:
+    WorldPacketCrypt();
 
-        void Init(SessionKey const& K);
-        void DecryptRecv(uint8* data, size_t len);
-        void EncryptSend(uint8* data, size_t len);
+    void Init(SessionKey const& K);
+    void DecryptRecv(uint8* data, size_t len);
+    void EncryptSend(uint8* data, size_t len);
 
-        bool IsInitialized() const { return _initialized; }
+    bool IsInitialized() const { return _initialized; }
 
-    private:
-        Trinity::Crypto::ARC4 _clientDecrypt;
-        Trinity::Crypto::ARC4 _serverEncrypt;
-        bool _initialized;
+private:
+    Trinity::Crypto::ARC4 _clientDecrypt;
+    Trinity::Crypto::ARC4 _serverEncrypt;
+    bool _initialized;
 };
-#endif
+
+#endif // _WORLDPACKETCRYPT_H

src/common/DataStores/DBCFileLoader.cpp

@@ -88,7 +88,7 @@ bool DBCFileLoader::Load(char const* filename, char const* fmt)
     for (uint32 i = 1; i < fieldCount; ++i)
     {
         fieldsOffset[i] = fieldsOffset[i - 1];
-        if (fmt[i - 1] == 'b' || fmt[i - 1] == 'X')         // byte fields
+        if (fmt[i - 1] == FT_BYTE || fmt[i - 1] == FT_NA_BYTE)  // byte fields
             fieldsOffset[i] += sizeof(uint8);
         else                                                // 4 byte fields (int32/float/strings)
             fieldsOffset[i] += sizeof(uint32);

src/common/DataStores/DBCFileLoader.h

@@ -24,17 +24,17 @@
 
 enum DbcFieldFormat
 {
-    FT_NA='x',                                              //not used or unknown, 4 byte size
-    FT_NA_BYTE='X',                                         //not used or unknown, byte
-    FT_STRING='s',                                          //char*
-    FT_FLOAT='f',                                           //float
-    FT_INT='i',                                             //uint32
-    FT_BYTE='b',                                            //uint8
-    FT_SORT='d',                                            //sorted by this field, field is not included
-    FT_IND='n',                                             //the same, but parsed to data
-    FT_LOGIC='l',                                           //Logical (boolean)
-    FT_SQL_PRESENT='p',                                     //Used in sql format to mark column present in sql dbc
-    FT_SQL_ABSENT='a'                                       //Used in sql format to mark column absent in sql dbc
+    FT_NA = 'x',                                            //not used or unknown, 4 byte size
+    FT_NA_BYTE = 'X',                                       //not used or unknown, byte
+    FT_STRING = 's',                                        //char*
+    FT_FLOAT = 'f',                                         //float
+    FT_INT = 'i',                                           //uint32
+    FT_BYTE = 'b',                                          //uint8
+    FT_SORT = 'd',                                          //sorted by this field, field is not included
+    FT_IND = 'n',                                           //the same, but parsed to data
+    FT_LOGIC = 'l',                                         //Logical (boolean)
+    FT_SQL_PRESENT = 'p',                                   //Used in sql format to mark column present in sql dbc
+    FT_SQL_ABSENT = 'a'                                     //Used in sql format to mark column absent in sql dbc
 };
 
 class TC_COMMON_API DBCFileLoader
@@ -51,21 +51,21 @@ class TC_COMMON_API DBCFileLoader
                 float getFloat(size_t field) const
                 {
                     ASSERT(field < file.fieldCount);
-                    float val = *reinterpret_cast<float*>(offset+file.GetOffset(field));
+                    float val = *reinterpret_cast<float*>(offset + file.GetOffset(field));
                     EndianConvert(val);
                     return val;
                 }
                 uint32 getUInt(size_t field) const
                 {
                     ASSERT(field < file.fieldCount);
-                    uint32 val = *reinterpret_cast<uint32*>(offset+file.GetOffset(field));
+                    uint32 val = *reinterpret_cast<uint32*>(offset + file.GetOffset(field));
                     EndianConvert(val);
                     return val;
                 }
                 uint8 getUInt8(size_t field) const
                 {
                     ASSERT(field < file.fieldCount);
-                    return *reinterpret_cast<uint8*>(offset+file.GetOffset(field));
+                    return *reinterpret_cast<uint8*>(offset + file.GetOffset(field));
                 }
 
                 const char *getString(size_t field) const
@@ -78,8 +78,8 @@ class TC_COMMON_API DBCFileLoader
 
             private:
                 Record(DBCFileLoader &file_, unsigned char *offset_): offset(offset_), file(file_) { }
-                unsigned char *offset;
-                DBCFileLoader &file;
+                unsigned char* offset;
+                DBCFileLoader& file;
 
                 friend class DBCFileLoader;
 

src/server/authserver/Authentication/AuthCodes.h

@@ -72,6 +72,40 @@ enum LoginResult
     LOGIN_LOCKED_ENFORCED                        = 0x10
 };
 
+enum GameAccountFlags
+{
+    GAMEACCOUNT_FLAG_GM                   = 0x00000001,
+    GAMEACCOUNT_FLAG_NOKICK               = 0x00000002,
+    GAMEACCOUNT_FLAG_COLLECTOR            = 0x00000004,
+    GAMEACCOUNT_FLAG_WOW_TRIAL            = 0x00000008,
+    GAMEACCOUNT_FLAG_CANCELLED            = 0x00000010,
+    GAMEACCOUNT_FLAG_IGR                  = 0x00000020,
+    GAMEACCOUNT_FLAG_WHOLESALER           = 0x00000040,
+    GAMEACCOUNT_FLAG_PRIVILEGED           = 0x00000080,
+    GAMEACCOUNT_FLAG_EU_FORBID_ELV        = 0x00000100,
+    GAMEACCOUNT_FLAG_EU_FORBID_BILLING    = 0x00000200,
+    GAMEACCOUNT_FLAG_WOW_RESTRICTED       = 0x00000400,
+    GAMEACCOUNT_FLAG_REFERRAL             = 0x00000800,
+    GAMEACCOUNT_FLAG_BLIZZARD             = 0x00001000,
+    GAMEACCOUNT_FLAG_RECURRING_BILLING    = 0x00002000,
+    GAMEACCOUNT_FLAG_NOELECTUP            = 0x00004000,
+    GAMEACCOUNT_FLAG_KR_CERTIFICATE       = 0x00008000,
+    GAMEACCOUNT_FLAG_EXPANSION_COLLECTOR  = 0x00010000,
+    GAMEACCOUNT_FLAG_DISABLE_VOICE        = 0x00020000,
+    GAMEACCOUNT_FLAG_DISABLE_VOICE_SPEAK  = 0x00040000,
+    GAMEACCOUNT_FLAG_REFERRAL_RESURRECT   = 0x00080000,
+    GAMEACCOUNT_FLAG_EU_FORBID_CC         = 0x00100000,
+    GAMEACCOUNT_FLAG_OPENBETA_DELL        = 0x00200000,
+    GAMEACCOUNT_FLAG_PROPASS              = 0x00400000,
+    GAMEACCOUNT_FLAG_PROPASS_LOCK         = 0x00800000,
+    GAMEACCOUNT_FLAG_PENDING_UPGRADE      = 0x01000000,
+    GAMEACCOUNT_FLAG_RETAIL_FROM_TRIAL    = 0x02000000,
+    GAMEACCOUNT_FLAG_EXPANSION2_COLLECTOR = 0x04000000,
+    GAMEACCOUNT_FLAG_OVERMIND_LINKED      = 0x08000000,
+    GAMEACCOUNT_FLAG_DEMOS                = 0x10000000,
+    GAMEACCOUNT_FLAG_DEATH_KNIGHT_OK      = 0x20000000,
+};
+
 enum ExpansionFlags
 {
     POST_BC_EXP_FLAG                            = 0x2,

src/server/authserver/Server/AuthSession.cpp

@@ -557,7 +557,7 @@ bool AuthSession::HandleLogonProof()
                 proof.M2 = M2;
                 proof.cmd = AUTH_LOGON_PROOF;
                 proof.error = 0;
-                proof.AccountFlags = 0x00800000;    // 0x01 = GM, 0x08 = Trial, 0x00800000 = Pro pass (arena tournament)
+                proof.AccountFlags = GAMEACCOUNT_FLAG_PROPASS_LOCK;
                 proof.SurveyId = 0;
                 proof.LoginFlags = 0;               // 0x1 = has account message