Core/Log Fix logging traded money

conan513 · Aug 19, 2018 · c56d85d · c56d85d
1 parent f8eb73e
commit c56d85d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp
@@ -493,33 +493,36 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPackets::Trade::AcceptTrade& acc
         moveItems(myItems, hisItems);
 
         // logging money
-        if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
+        if (my_trade->GetMoney() > 0)
         {
-            if (my_trade->GetMoney() > 0)
+            if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
             {
                 sLog->outCommand(_player->GetSession()->GetAccountId(), "GM %s (Account: %u) give money (Amount: " UI64FMTD ") to player: %s (Account: %u)",
                     _player->GetName().c_str(), _player->GetSession()->GetAccountId(),
                     my_trade->GetMoney(),
                     trader->GetName().c_str(), trader->GetSession()->GetAccountId());
-
-                TC_LOG_INFO("metric", "%s (Account: %u) give money (Amount: " UI64FMTD ") to %s (Account: %u)",
-                    _player->GetName().c_str(), _player->GetSession()->GetAccountId(),
-                    my_trade->GetMoney(),
-                    trader->GetName().c_str(), trader->GetSession()->GetAccountId());
             }
 
-            if (his_trade->GetMoney() > 0)
+            TC_LOG_INFO("metric", "%s (Account: %u) give money (Amount: " UI64FMTD ") to %s (Account: %u)",
+                _player->GetName().c_str(), _player->GetSession()->GetAccountId(),
+                my_trade->GetMoney(),
+                trader->GetName().c_str(), trader->GetSession()->GetAccountId());
+        }
+
+        if (his_trade->GetMoney() > 0)
+        {
+            if (HasPermission(rbac::RBAC_PERM_LOG_GM_TRADE))
             {
                 sLog->outCommand(trader->GetSession()->GetAccountId(), "GM %s (Account: %u) give money (Amount: " UI64FMTD ") to player: %s (Account: %u)",
                     trader->GetName().c_str(), trader->GetSession()->GetAccountId(),
                     his_trade->GetMoney(),
                     _player->GetName().c_str(), _player->GetSession()->GetAccountId());
-
-                TC_LOG_INFO("metric", "%s (Account: %u) give money (Amount: " UI64FMTD ") to %s (Account: %u)",
-                    trader->GetName().c_str(), trader->GetSession()->GetAccountId(),
-                    my_trade->GetMoney(),
-                    _player->GetName().c_str(), _player->GetSession()->GetAccountId());
             }
+
+            TC_LOG_INFO("metric", "%s (Account: %u) give money (Amount: " UI64FMTD ") to %s (Account: %u)",
+                trader->GetName().c_str(), trader->GetSession()->GetAccountId(),
+                my_trade->GetMoney(),
+                _player->GetName().c_str(), _player->GetSession()->GetAccountId());
         }
 
         // update money

diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
@@ -754,12 +754,7 @@ class spell_mage_conflagration : public AuraScript
 
     bool CheckProc(ProcEventInfo& eventInfo)
     {
-        bool _spellCanProc = (eventInfo.GetSpellInfo()->Id == SPELL_MAGE_FIREBALL);
-
-        if (_spellCanProc)
-            return true;
-
-        return false;
+        return eventInfo.GetSpellInfo()->Id == SPELL_MAGE_FIREBALL;
     }
 
     void Register() override