Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
This commit is contained in:
Carbenium committed 2015-07-21 19:02:53 +02:00
commit c0ee4ceac4
15 files changed
+125 -12

No files matched your search

+3 -1
View File
@@ -115,7 +115,9 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket& recvData)
{
uint32 dungeon;
recvData >> dungeon;
newDungeons.insert((dungeon & 0x00FFFFFF)); // remove the type from the dungeon entry
dungeon &= 0x00FFFFFF; // remove the type from the dungeon entry
if (dungeon)
newDungeons.insert(dungeon);
}
TC_LOG_DEBUG("lfg", "CMSG_LFG_JOIN %s roles: %u, Dungeons: %u, Comment: %s",