Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Handlers/ItemHandler.cpp src/server/scripts/Spells/spell_dk.cpp
This commit is contained in:
commit
1f62d9c387
28 files changed
+1402
-1048
No files matched your search
@@ -126,7 +126,8 @@ WorldSession::WorldSession(uint32 id, WorldSocket* sock, AccountTypes sec, uint8
|
||||
isRecruiter(isARecruiter),
|
||||
_RBACData(NULL),
|
||||
expireTime(60000), // 1 min after socket loss, session is deleted
|
||||
forceExit(false)
|
||||
forceExit(false),
|
||||
m_currentBankerGUID(0)
|
||||
{
|
||||
memset(m_Tutorials, 0, sizeof(m_Tutorials));
|
||||
|
||||
|
||||
Reference in new issue
Block a user