diff options
author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-21 17:10:33 +0100 |
---|---|---|
committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-21 17:10:33 +0100 |
commit | 7d37629c17286ceef31e0746da50c73cade7a958 (patch) | |
tree | a41209d1aeb67ad5963ee73629413cbc974ac966 /src | |
parent | c0c2e533a967640bd14553fa98916974e013e7bd (diff) | |
parent | 5143804014a6485e2cd35f75fa9db64228518ef5 (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Accounts/AccountMgr.cpp | 3 | ||||
-rw-r--r-- | src/server/game/Entities/Vehicle/Vehicle.cpp | 1 | ||||
-rw-r--r-- | src/server/shared/Logging/Log.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 12624c29686..8c08a9ae202 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -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) diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 02c5e4a2e1a..5e80fab217f 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -741,6 +741,7 @@ bool VehicleJoinEvent::Execute(uint64, uint32) } Passenger->InterruptNonMeleeSpells(false); + Passenger->RemoveAurasByType(SPELL_AURA_MOUNTED); Player* player = Passenger->ToPlayer(); if (player) diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 920ce4ce570..f0275f8c6b2 100644 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -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() |