mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-24 02:46:33 +01:00
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
This commit is contained in:
@@ -439,10 +439,7 @@ void AccountMgr::LoadRBAC()
|
||||
Tokenizer tokens(defaultGroups, ',');
|
||||
for (Tokenizer::const_iterator itr = tokens.begin(); itr != tokens.end(); ++itr)
|
||||
if (uint32 groupId = atoi(*itr))
|
||||
{
|
||||
sLog->outError(LOG_FILTER_LFG, "Adding default group %u", groupId);
|
||||
_defaultGroups.insert(groupId);
|
||||
}
|
||||
}
|
||||
|
||||
void AccountMgr::UpdateAccountAccess(RBACData* rbac, uint32 accountId, uint8 securityLevel, int32 realmId)
|
||||
|
||||
@@ -741,6 +741,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32)
|
||||
}
|
||||
|
||||
Passenger->InterruptNonMeleeSpells(false);
|
||||
Passenger->RemoveAurasByType(SPELL_AURA_MOUNTED);
|
||||
|
||||
Player* player = Passenger->ToPlayer();
|
||||
if (player)
|
||||
|
||||
@@ -286,7 +286,10 @@ void Log::write(LogMessage* msg)
|
||||
if (worker)
|
||||
worker->enqueue(new LogOperation(logger, msg));
|
||||
else
|
||||
{
|
||||
logger->write(*msg);
|
||||
delete msg;
|
||||
}
|
||||
}
|
||||
|
||||
std::string Log::GetTimestampStr()
|
||||
|
||||
Reference in New Issue
Block a user