fix for PR

# Conflicts: # src/authserver/Server/AuthSocket.cpp # src/game/AI/SmartScripts/SmartScript.cpp # src/game/DungeonFinding/LFGMgr.cpp # src/game/Entities/Player/Player.cpp # src/game/Entities/Unit/Unit.cpp # src/game/Entities/Vehicle/Vehicle.cpp # src/game/Guilds/Guild.cpp # src/game/Handlers/ChannelHandler.cpp # src/game/Handlers/GuildHandler.cpp # src/game/Handlers/LFGHandler.cpp # src/game/Handlers/LootHandler.cpp # src/game/Handlers/MiscHandler.cpp # src/game/Handlers/PetitionsHandler.cpp # src/game/Handlers/QueryHandler.cpp # src/game/Movement/MotionMaster.cpp # src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp # src/game/Server/WorldSocket.cpp # src/game/Spells/Auras/SpellAuraEffects.cpp # src/game/Spells/SpellEffects.cpp # src/scripts/Commands/cs_modify.cpp
author: talamortis <talamortis@gmail.com> 2017-06-30 20:06:12 +0100
committer: Yehonal <yehonal.azeroth@gmail.com> 2017-08-20 02:33:48 +0200
commit: e471c1bb6a241cfffe9c7ae61aa502eba9a046a0 (patch)
tree: 2142523ff7d35b34e9b3789c813939e84c405e16
parent: bf80a43d7861e6d53946e156b80ed5be3f2a2127 (diff)
18 files changed, 211 insertions, 306 deletions
diff --git a/src/authserver/Server/AuthSocket.cpp b/src/authserver/Server/AuthSocket.cpp
index 71ea08629d..98d204fa99 100644
--- a/src/authserver/Server/AuthSocket.cpp
+++ b/src/authserver/Server/AuthSocket.cpp
@@ -766,9 +766,8 @@ bool AuthSocket::_HandleLogonProof()
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] IP %s got banned for '%u' seconds because account %s failed to authenticate '%u' times",
-#endif
-                         //   socket().getRemoteAddress().c_str(), socket().getRemotePort(), socket().getRemoteAddress().c_str(), WrongPassBanTime, _login.c_str(), failed_logins);
-                    }
+                            socket().getRemoteAddress().c_str(), socket().getRemotePort(), socket().getRemoteAddress().c_str(), WrongPassBanTime, _login.c_str(), failed_logins);
+#endif                    }
                 }
             }
         }
diff --git a/src/game/AI/SmartScripts/SmartScript.cpp b/src/game/AI/SmartScripts/SmartScript.cpp
index d7c1d0af10..c665b26102 100644
--- a/src/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/game/AI/SmartScripts/SmartScript.cpp
@@ -194,9 +194,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             mUseTextTimer = true;
             sCreatureTextMgr->SendChat(talker, uint8(e.action.talk.textGroupID), talkTarget);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-			sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textGuid: %u", talker->GetName().c_str(), talker->GetGUIDLow(), GUID_LOPART(mTextGUID));
-#endif            break;
-        }
+            sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_TALK: talker: %s (GuidLow: %u), textId: %u", talker->GetName().c_str(), talker->GetGUIDLow(), mLastTextID);
+#endif
+            break;        }
         case SMART_ACTION_SIMPLE_TALK:
         {
             ObjectList* targets = GetTargets(e, unit);
@@ -213,9 +213,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     }
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SIMPLE_TALK: talker: %s (GuidLow: %u), textGroupId: %u",
-#endif
-                    //    (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), uint8(e.action.talk.textGroupID));
-                }
+                       (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), uint8(e.action.talk.textGroupID));
+#endif                }
 
                 delete targets;
             }
@@ -233,9 +232,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                         (*itr)->ToUnit()->HandleEmoteCommand(e.action.emote.emote);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_PLAY_EMOTE: target: %s (GuidLow: %u), emote: %u",
-#endif
-                        //    (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.emote.emote);
-                    }
+                            (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.emote.emote);
+#endif                    }
                 }
 
                 delete targets;
@@ -254,9 +252,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                         (*itr)->SendPlaySound(e.action.sound.sound, e.action.sound.onlySelf > 0);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SOUND: target: %s (GuidLow: %u), sound: %u, onlyself: %u",
-#endif
-                        //    (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.sound.sound, e.action.sound.range);
-                    }
+                            (*itr)->GetName().c_str(), (*itr)->GetGUIDLow(), e.action.sound.sound);
+#endif                    }
                 }
 
                 delete targets;
@@ -277,9 +274,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                             (*itr)->ToCreature()->setFaction(e.action.faction.factionID);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u",
-#endif
-                            //    (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.faction.factionID);
-                        }
+                                (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.faction.factionID);
+#endif                        }
                         else
                         {
                             if (CreatureTemplate const* ci = sObjectMgr->GetCreatureTemplate((*itr)->ToCreature()->GetEntry()))
@@ -289,9 +285,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                                     (*itr)->ToCreature()->setFaction(ci->faction);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_FACTION: Creature entry %u, GuidLow %u set faction to %u",
-#endif
-                                    //    (*itr)->GetEntry(), (*itr)->GetGUIDLow(), ci->faction);
-                                }
+                                        (*itr)->GetEntry(), (*itr)->GetGUIDLow(), ci->faction);
+#endif                                }
                             }
                         }
                     }
@@ -323,9 +318,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                             (*itr)->ToCreature()->SetDisplayId(displayId);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u set displayid to %u",
-#endif
-                            //    (*itr)->GetEntry(), (*itr)->GetGUIDLow(), display_id);
-                        }
+                                (*itr)->GetEntry(), (*itr)->GetGUIDLow(), displayId);
+#endif                        }
                     }
                     //if no param1, then use value from param2 (modelId)
                     else
@@ -333,18 +327,16 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                         (*itr)->ToCreature()->SetDisplayId(e.action.morphOrMount.model);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u set displayid to %u",
-#endif
-                        //    (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.morphOrMount.model);
-                    }
+                            (*itr)->GetEntry(), (*itr)->GetGUIDLow(), e.action.morphOrMount.model);
+#endif                    }
                 }
                 else
                 {
                     (*itr)->ToCreature()->DeMorph();
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_MORPH_TO_ENTRY_OR_MODEL: Creature entry %u, GuidLow %u demorphs.",
-#endif
-                    //    (*itr)->GetEntry(), (*itr)->GetGUIDLow());
-                }
+                        (*itr)->GetEntry(), (*itr)->GetGUIDLow());
+#endif                }
             }
 
             delete targets;
@@ -363,9 +355,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     (*itr)->ToPlayer()->FailQuest(e.action.quest.quest);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_FAIL_QUEST: Player guidLow %u fails quest %u",
-#endif
-                    //    (*itr)->GetGUIDLow(), e.action.quest.quest);
-                }
+                        (*itr)->GetGUIDLow(), e.action.quest.quest);
+#endif                }
             }
 
             delete targets;
@@ -386,9 +377,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                         (*itr)->ToPlayer()->AddQuestAndCheckCompletion(q, NULL);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ADD_QUEST: Player guidLow %u add quest %u",
-#endif
-                        //    (*itr)->GetGUIDLow(), e.action.quest.quest);
-                    }
+                            (*itr)->GetGUIDLow(), e.action.quest.quest);
+#endif                    }
                 }
             }
 
@@ -450,9 +440,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     (*itr)->ToUnit()->HandleEmoteCommand(emote);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_RANDOM_EMOTE: Creature guidLow %u handle random emote %u",
-#endif
-                    //    (*itr)->GetGUIDLow(), emote);
-                }
+                        (*itr)->GetGUIDLow(), emote);
+#endif                }
             }
 
             delete targets;
@@ -471,9 +460,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     me->getThreatManager().modifyThreatPercent(target, e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_THREAT_ALL_PCT: Creature guidLow %u modify threat for unit %u, value %i",
-#endif
-                    //    me->GetGUIDLow(), target->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
-                }
+                        me->GetGUIDLow(), target->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
+#endif                }
             }
             break;
         }
@@ -493,9 +481,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     me->getThreatManager().modifyThreatPercent((*itr)->ToUnit(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_THREAT_SINGLE_PCT: Creature guidLow %u modify threat for unit %u, value %i",
-#endif
-                    //    me->GetGUIDLow(), (*itr)->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
-                }
+                        me->GetGUIDLow(), (*itr)->GetGUIDLow(), e.action.threatPCT.threatINC ? (int32)e.action.threatPCT.threatINC : -(int32)e.action.threatPCT.threatDEC);
+#endif                }
             }
 
             delete targets;
@@ -522,9 +509,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                         player->GroupEventHappens(e.action.quest.quest, me);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_CALL_AREAEXPLOREDOREVENTHAPPENS: Player guidLow %u credited quest %u",
-#endif
-                        //    (*itr)->GetGUIDLow(), e.action.quest.quest);
-                    }
+                            (*itr)->GetGUIDLow(), e.action.quest.quest);
+#endif                    }
                 }
             }
 
@@ -631,9 +617,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     (*itr)->ToUnit()->AddAura(e.action.cast.spell, (*itr)->ToUnit());
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ADD_AURA: Adding aura %u to unit %u",
-#endif
-                    //    e.action.cast.spell, (*itr)->GetGUIDLow());
-                }
+                        e.action.cast.spell, (*itr)->GetGUIDLow());
+#endif                }
             }
 
             delete targets;
@@ -655,9 +640,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     (*itr)->ToGameObject()->UseDoorOrButton(0, e.action.activateObject.alternative ? true : false, unit);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ACTIVATE_GOBJECT. Gameobject %u (entry: %u) activated",
-#endif
-                    //    (*itr)->GetGUIDLow(), (*itr)->GetEntry());
-                }
+                        (*itr)->GetGUIDLow(), (*itr)->GetEntry());
+#endif                }
             }
 
             delete targets;
@@ -676,9 +660,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     (*itr)->ToGameObject()->ResetDoorOrButton();
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_RESET_GOBJECT. Gameobject %u (entry: %u) reset",
-#endif
-                    //    (*itr)->GetGUIDLow(), (*itr)->GetEntry());
-                }
+                        (*itr)->GetGUIDLow(), (*itr)->GetEntry());
+#endif                }
             }
 
             delete targets;
@@ -697,9 +680,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     (*itr)->ToUnit()->SetUInt32Value(UNIT_NPC_EMOTESTATE, e.action.emote.emote);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_EMOTE_STATE. Unit %u set emotestate to %u",
-#endif
-                    //    (*itr)->GetGUIDLow(), e.action.emote.emote);
-                }
+                        (*itr)->GetGUIDLow(), e.action.emote.emote);
+#endif                }
             }
 
             delete targets;
@@ -769,9 +751,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             CAST_AI(SmartAI, me->AI())->SetAutoAttack(e.action.autoAttack.attack);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_AUTO_ATTACK: Creature: %u bool on = %u",
-#endif
-            //    me->GetGUIDLow(), e.action.autoAttack.attack);
-            break;
+                me->GetGUIDLow(), e.action.autoAttack.attack);
+#endif            break;
         }
         case SMART_ACTION_ALLOW_COMBAT_MOVEMENT:
         {
@@ -789,9 +770,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                 CAST_AI(SmartAI, me->AI())->SetCombatMove(move);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_ALLOW_COMBAT_MOVEMENT: Creature %u bool on = %u",
-#endif
-            //    me->GetGUIDLow(), e.action.combatMove.move);
-            break;
+                me->GetGUIDLow(), e.action.combatMove.move);
+#endif            break;
         }
         case SMART_ACTION_SET_EVENT_PHASE:
         {
@@ -801,9 +781,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             SetPhase(e.action.setEventPhase.phase);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SET_EVENT_PHASE: Creature %u set event phase %u",
-#endif
-            //    GetBaseObject()->GetGUIDLow(), e.action.setEventPhase.phase);
-            break;
+                GetBaseObject()->GetGUIDLow(), e.action.setEventPhase.phase);
+#endif            break;
         }
         case SMART_ACTION_INC_EVENT_PHASE:
         {
@@ -814,9 +793,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             DecPhase(e.action.incEventPhase.dec);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_INC_EVENT_PHASE: Creature %u inc event phase by %u, "
-#endif
-            //    "decrease by %u", GetBaseObject()->GetGUIDLow(), e.action.incEventPhase.inc, e.action.incEventPhase.dec);
-            break;
+                "decrease by %u", GetBaseObject()->GetGUIDLow(), e.action.incEventPhase.inc, e.action.incEventPhase.dec);
+#endif            break;
         }
         case SMART_ACTION_EVADE:
         {
@@ -877,9 +855,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                         player->GroupEventHappens(e.action.quest.quest, GetBaseObject());
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_GROUPEVENTHAPPENS: Player %u, group credit for quest %u",
-#endif
-                    //  (*itr)->GetGUIDLow(), e.action.quest.quest);
-                }
+                      (*itr)->GetGUIDLow(), e.action.quest.quest);
+#endif                }
             }
             
             delete targets;
@@ -911,9 +888,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                 sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_REMOVEAURASFROMSPELL: Unit %u, spell %u",
-#endif
-                //    (*itr)->GetGUIDLow(), e.action.removeAura.spell);
-            }
+                    (*itr)->GetGUIDLow(), e.action.removeAura.spell);
+#endif            }
 
             delete targets;
             break;
@@ -938,9 +914,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     CAST_AI(SmartAI, me->AI())->SetFollow((*itr)->ToUnit(), float(int32(e.action.follow.dist))+0.1f, angle, e.action.follow.credit, e.action.follow.entry, e.action.follow.creditType, e.action.follow.aliveState);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_FOLLOW: Creature %u following target %u",
-#endif
-                    //    me->GetGUIDLow(), (*itr)->GetGUIDLow());
-                    break;
+                        me->GetGUIDLow(), (*itr)->GetGUIDLow());
+#endif                    break;
                 }
             }
 
@@ -977,9 +952,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             SetPhase(phase);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE: Creature %u sets event phase to %u",
-#endif
-            //    GetBaseObject()->GetGUIDLow(), phase);
-            break;
+                GetBaseObject()->GetGUIDLow(), phase);
+#endif            break;
         }
         case SMART_ACTION_RANDOM_PHASE_RANGE:
         {
@@ -990,9 +964,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             SetPhase(phase);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_RANDOM_PHASE_RANGE: Creature %u sets event phase to %u",
-#endif
-            //    GetBaseObject()->GetGUIDLow(), phase);
-            break;
+                GetBaseObject()->GetGUIDLow(), phase);
+#endif            break;
         }
         case SMART_ACTION_CALL_KILLEDMONSTER:
         {
@@ -1001,9 +974,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                 unit->ToPlayer()->RewardPlayerAndGroupAtEvent(e.action.killedMonster.creature, unit);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                 sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_KILLEDMONSTER: (trigger == true) Player %u, Killcredit: %u",
-#endif
-                //    unit->GetGUIDLow(), e.action.killedMonster.creature);
-            }
+                    unit->GetGUIDLow(), e.action.killedMonster.creature);
+#endif            }
             else if (e.target.type == SMART_TARGET_NONE || e.target.type == SMART_TARGET_SELF) // Loot recipient and his group members
             {
                 if (!me)
@@ -1034,9 +1006,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                     player->RewardPlayerAndGroupAtEvent(e.action.killedMonster.creature, player);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_CALL_KILLEDMONSTER: Player %u, Killcredit: %u",
-#endif
-                    //    (*itr)->GetGUIDLow(), e.action.killedMonster.creature);
-                }
+                        (*itr)->GetGUIDLow(), e.action.killedMonster.creature);
+#endif                }
 
                 delete targets;
             }
@@ -1061,9 +1032,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             instance->SetData(e.action.setInstanceData.field, e.action.setInstanceData.data);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_INST_DATA: Field: %u, data: %u",
-#endif
-            //    e.action.setInstanceData.field, e.action.setInstanceData.data);
-            break;
+                e.action.setInstanceData.field, e.action.setInstanceData.data);
+#endif            break;
         }
         case SMART_ACTION_SET_INST_DATA64:
         {
@@ -1088,9 +1058,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
             instance->SetData64(e.action.setInstanceData64.field, targets->front()->GetGUID());
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_INST_DATA64: Field: %u, data: "UI64FMTD,
+                e.action.setInstanceData64.field, targets->front()->GetGUID());
 #endif
-            //    e.action.setInstanceData64.field, targets->front()->GetGUID());
-
             delete targets;
             break;
         }
@@ -1158,9 +1127,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
                 me->SetSheath(SheathState(e.action.setSheath.sheath));
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                 sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: SMART_ACTION_SET_SHEATH: Creature %u, State: %u",
-#endif
-                //    me->GetGUIDLow(), e.action.setSheath.sheath);
-            }
+                    me->GetGUIDLow(), e.action.setSheath.sheath);
+#endif            }
             break;
         }
         case SMART_ACTION_FORCE_DESPAWN:
@@ -2305,9 +2273,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
             sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction:: SMART_ACTION_SEND_GOSSIP_MENU: gossipMenuId %d, gossipNpcTextId %d",
+                e.action.sendGossipMenu.gossipMenuId, e.action.sendGossipMenu.gossipNpcTextId);
 #endif
-            //    e.action.sendGossipMenu.gossipMenuId, e.action.sendGossipMenu.gossipNpcTextId);
-
             ObjectList* targets = GetTargets(e, unit);
             if (!targets)
                 break;
diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/game/DungeonFinding/LFGMgr.cpp
index 6257809456..a7fb602bc1 100644
--- a/src/game/DungeonFinding/LFGMgr.cpp
+++ b/src/game/DungeonFinding/LFGMgr.cpp
@@ -723,8 +723,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const
 */
 void LFGMgr::LeaveLfg(uint64 guid)
 {
-    //sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::LeaveLfg: [" UI64FMTD "]", guid);
-
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::Leave: [" UI64FMTD "]", guid);
     uint64 gguid = IS_GROUP_GUID(guid) ? guid : GetGroup(guid);
     LfgState state = GetState(guid);
     switch (state)
@@ -1606,7 +1605,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint64 guid, bool accept)
     player.accept = LfgAnswer(accept);
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::UpdateProposal: Player [" UI64FMTD "] of proposal %u selected: %u", guid, proposalId, accept);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::UpdateProposal: Player [" UI64FMTD "] of proposal %u selected: %u", guid, proposalId, accept);
 #endif
     if (!accept)
     {
@@ -1699,7 +1698,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate
     proposal.state = LFG_PROPOSAL_FAILED;
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Proposal %u, state FAILED, UpdateType %u", itProposal->first, type);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Proposal %u, state FAILED, UpdateType %u", itProposal->first, type);
 #endif
     // Mark all people that didn't answered as no accept
     if (type == LFG_UPDATETYPE_PROPOSAL_FAILED)
@@ -1745,14 +1744,14 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate
             {
                 updateData.updateType = type;
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-                sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] didn't accept. Removing from queue and compatible cache", guid);
+                sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] didn't accept. Removing from queue and compatible cache", guid);
 #endif
             }
             else
             {
                 updateData.updateType = LFG_UPDATETYPE_REMOVED_FROM_QUEUE;
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-                sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] in same group that someone that didn't accept. Removing from queue and compatible cache", guid);
+                sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] in same group that someone that didn't accept. Removing from queue and compatible cache", guid);
 #endif
             }
 
@@ -1768,7 +1767,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate
         else
         {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-            sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Readding [" UI64FMTD "] to queue.", guid);
+            sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveProposal: Readding [" UI64FMTD "] to queue.", guid);
 #endif
             SetState(guid, LFG_STATE_QUEUED);
             if (gguid != guid)
@@ -2146,7 +2145,7 @@ LfgState LFGMgr::GetState(uint64 guid)
         state = PlayersStore[guid].GetState();
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "] = %u", guid, state);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "] = %u", guid, state);
 #endif
     return state;
 }
@@ -2160,7 +2159,7 @@ LfgState LFGMgr::GetOldState(uint64 guid)
         state = PlayersStore[guid].GetOldState();
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetOldState: [" UI64FMTD "] = %u", guid, state);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetOldState: [" UI64FMTD "] = %u", guid, state);
 #endif
     return state;
 }
@@ -2169,7 +2168,7 @@ uint32 LFGMgr::GetDungeon(uint64 guid, bool asId /*= true */)
 {
     uint32 dungeon = GroupsStore[guid].GetDungeon(asId);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetDungeon: [" UI64FMTD "] asId: %u = %u", guid, asId, dungeon);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetDungeon: [" UI64FMTD "] asId: %u = %u", guid, asId, dungeon);
 #endif
     return dungeon;
 }
@@ -2183,7 +2182,7 @@ uint32 LFGMgr::GetDungeonMapId(uint64 guid)
             mapId = dungeon->map;
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetDungeonMapId: [" UI64FMTD "] = %u (DungeonId = %u)", guid, mapId, dungeonId);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetDungeonMapId: [" UI64FMTD "] = %u (DungeonId = %u)", guid, mapId, dungeonId);
 #endif
     return mapId;
 }
@@ -2192,7 +2191,7 @@ uint8 LFGMgr::GetRoles(uint64 guid)
 {
     uint8 roles = PlayersStore[guid].GetRoles();
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetRoles: [" UI64FMTD "] = %u", guid, roles);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetRoles: [" UI64FMTD "] = %u", guid, roles);
 #endif
     return roles;
 }
@@ -2200,7 +2199,7 @@ uint8 LFGMgr::GetRoles(uint64 guid)
 const std::string& LFGMgr::GetComment(uint64 guid)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetComment: [" UI64FMTD "] = %s", guid, PlayersStore[guid].GetComment().c_str());
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetComment: [" UI64FMTD "] = %s", guid, PlayersStore[guid].GetComment().c_str());
 #endif
     return PlayersStore[guid].GetComment();
 }
@@ -2208,7 +2207,7 @@ const std::string& LFGMgr::GetComment(uint64 guid)
 LfgDungeonSet const& LFGMgr::GetSelectedDungeons(uint64 guid)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetSelectedDungeons: [" UI64FMTD "]", guid);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetSelectedDungeons: [" UI64FMTD "]", guid);
 #endif
     return PlayersStore[guid].GetSelectedDungeons();
 }
@@ -2216,7 +2215,7 @@ LfgDungeonSet const& LFGMgr::GetSelectedDungeons(uint64 guid)
 LfgLockMap const& LFGMgr::GetLockedDungeons(uint64 guid)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetLockedDungeons: [" UI64FMTD "]", guid);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetLockedDungeons: [" UI64FMTD "]", guid);
 #endif
     return PlayersStore[guid].GetLockedDungeons();
 }
@@ -2225,7 +2224,7 @@ uint8 LFGMgr::GetKicksLeft(uint64 guid)
 {
     uint8 kicks = GroupsStore[guid].GetKicksLeft();
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::GetKicksLeft: [" UI64FMTD "] = %u", guid, kicks);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetKicksLeft: [" UI64FMTD "] = %u", guid, kicks);
 #endif
     return kicks;
 }
@@ -2289,7 +2288,7 @@ void LFGMgr::SetCanOverrideRBState(uint64 guid, bool val)
 void LFGMgr::SetDungeon(uint64 guid, uint32 dungeon)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetDungeon: [" UI64FMTD "] dungeon %u", guid, dungeon);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetDungeon: [" UI64FMTD "] dungeon %u", guid, dungeon);
 #endif
     GroupsStore[guid].SetDungeon(dungeon);
 }
@@ -2297,7 +2296,7 @@ void LFGMgr::SetDungeon(uint64 guid, uint32 dungeon)
 void LFGMgr::SetRoles(uint64 guid, uint8 roles)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetRoles: [" UI64FMTD "] roles: %u", guid, roles);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetRoles: [" UI64FMTD "] roles: %u", guid, roles);
 #endif
     PlayersStore[guid].SetRoles(roles);
 }
@@ -2305,7 +2304,7 @@ void LFGMgr::SetRoles(uint64 guid, uint8 roles)
 void LFGMgr::SetComment(uint64 guid, std::string const& comment)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetComment: [" UI64FMTD "] comment: %s", guid, comment.c_str());
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetComment: [" UI64FMTD "] comment: %s", guid, comment.c_str());
 #endif
     PlayersStore[guid].SetComment(comment);
 }
@@ -2326,7 +2325,7 @@ void LFGMgr::LfrSetComment(Player* p, std::string comment)
 void LFGMgr::SetSelectedDungeons(uint64 guid, LfgDungeonSet const& dungeons)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetSelectedDungeons: [" UI64FMTD "]", guid);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid);
 #endif
     PlayersStore[guid].SetSelectedDungeons(dungeons);
 }
@@ -2334,7 +2333,7 @@ void LFGMgr::SetSelectedDungeons(uint64 guid, LfgDungeonSet const& dungeons)
 void LFGMgr::SetLockedDungeons(uint64 guid, LfgLockMap const& lock)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid);
 #endif
     PlayersStore[guid].SetLockedDungeons(lock);
 }
@@ -2342,7 +2341,7 @@ void LFGMgr::SetLockedDungeons(uint64 guid, LfgLockMap const& lock)
 void LFGMgr::DecreaseKicksLeft(uint64 guid)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::DecreaseKicksLeft: [" UI64FMTD "]", guid);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::DecreaseKicksLeft: [" UI64FMTD "]", guid);
 #endif
     GroupsStore[guid].DecreaseKicksLeft();
 }
@@ -2350,7 +2349,7 @@ void LFGMgr::DecreaseKicksLeft(uint64 guid)
 void LFGMgr::RemoveGroupData(uint64 guid)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug((LOG_FILTER_LFG, "LFGMgr::RemoveGroupData: [" UI64FMTD "]", guid);
+    sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveGroupData: [" UI64FMTD "]", guid);
 #endif
     LfgGroupDataContainer::iterator it = GroupsStore.find(guid);
     if (it == GroupsStore.end())
diff --git a/src/game/Entities/Player/Player.cpp b/src/game/Entities/Player/Player.cpp
index db7c41e3f9..f947eb860d 100644
--- a/src/game/Entities/Player/Player.cpp
+++ b/src/game/Entities/Player/Player.cpp
@@ -18602,18 +18602,16 @@ Item* Player::_LoadItem(SQLTransaction& trans, uint32 zoneId, uint32 timeDiff, F
             {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                 sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Player::_LoadInventory: player (GUID: %u, name: '%s', map: %u) has item (GUID: %u, entry: %u) limited to another map (%u). Deleting item.",
-#endif
-                //    GetGUIDLow(), GetName().c_str(), GetMapId(), item->GetGUIDLow(), item->GetEntry(), zoneId);
-                remove = true;
+                    GetGUIDLow(), GetName().c_str(), GetMapId(), item->GetGUIDLow(), item->GetEntry(), zoneId);
+#endif                remove = true;
             }
             // "Conjured items disappear if you are logged out for more than 15 minutes"
             else if (timeDiff > 15 * MINUTE && proto->Flags & ITEM_PROTO_FLAG_CONJURED)
             {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                 sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Player::_LoadInventory: player (GUID: %u, name: '%s', diff: %u) has conjured item (GUID: %u, entry: %u) with expired lifetime (15 minutes). Deleting item.",
-#endif
-                //    GetGUIDLow(), GetName().c_str(), timeDiff, item->GetGUIDLow(), item->GetEntry());
-                remove = true;
+                    GetGUIDLow(), GetName().c_str(), timeDiff, item->GetGUIDLow(), item->GetEntry());
+#endif                remove = true;
             }
             else if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE))
             {
@@ -18621,9 +18619,8 @@ Item* Player::_LoadItem(SQLTransaction& trans, uint32 zoneId, uint32 timeDiff, F
                 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Player::_LoadInventory: player (GUID: %u, name: '%s') has item (GUID: %u, entry: %u) with expired refund time (%u). Deleting refund data and removing refundable flag.",
+                        GetGUIDLow(), GetName().c_str(), item->GetGUIDLow(), item->GetEntry(), item->GetPlayedTime());
 #endif
-                    //    GetGUIDLow(), GetName().c_str(), item->GetGUIDLow(), item->GetEntry(), item->GetPlayedTime());
-
                     stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_REFUND_INSTANCE);
                     stmt->setUInt32(0, item->GetGUIDLow());
                     trans->Append(stmt);
@@ -18647,9 +18644,8 @@ Item* Player::_LoadItem(SQLTransaction& trans, uint32 zoneId, uint32 timeDiff, F
                     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                         sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Player::_LoadInventory: player (GUID: %u, name: '%s') has item (GUID: %u, entry: %u) with refundable flags, but without data in item_refund_instance. Removing flag.",
-#endif
                         //    GetGUIDLow(), GetName().c_str(), item->GetGUIDLow(), item->GetEntry());
-                        item->RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE);
+#endif                        item->RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_REFUNDABLE);
                     }
                 }
             }
@@ -18677,9 +18673,8 @@ Item* Player::_LoadItem(SQLTransaction& trans, uint32 zoneId, uint32 timeDiff, F
                 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_PLAYER_LOADING, "Player::_LoadInventory: player (GUID: %u, name: '%s') has item (GUID: %u, entry: %u) with ITEM_FLAG_BOP_TRADEABLE flag, but without data in item_soulbound_trade_data. Removing flag.",
-#endif
-                    //    GetGUIDLow(), GetName().c_str(), item->GetGUIDLow(), item->GetEntry());
-                    item->RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_BOP_TRADEABLE);
+                        GetGUIDLow(), GetName().c_str(), item->GetGUIDLow(), item->GetEntry());
+#endif                    item->RemoveFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_BOP_TRADEABLE);
                 }
             }
             else if (proto->HolidayId)
@@ -19488,9 +19483,8 @@ bool Player::_LoadHomeBind(PreparedQueryResult result)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outStaticDebug("Setting player home position - mapid: %u, areaid: %u, X: %f, Y: %f, Z: %f",
+        m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ);
 #endif
-    //    m_homebindMapId, m_homebindAreaId, m_homebindX, m_homebindY, m_homebindZ);
-
     return true;
 }
 
@@ -25367,7 +25361,7 @@ void Player::HandleFall(MovementInfo const& movementInfo)
 
             //Z given by moveinfo, LastZ, FallTime, WaterZ, MapZ, Damage, Safefall reduction
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-            sLog->outStaticDebug("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d", movementInfo.pos.GetPositionZ(), height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall);
+            sLog->outStaticDebug("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d", movementInfo.pos.GetPositionZ(), GetPositionZ(), movementInfo.fallTime, damage, safe_fall);
 #endif
         }
 
diff --git a/src/game/Entities/Unit/Unit.cpp b/src/game/Entities/Unit/Unit.cpp
index fb7cb42b31..a6004c12fb 100644
--- a/src/game/Entities/Unit/Unit.cpp
+++ b/src/game/Entities/Unit/Unit.cpp
@@ -15154,9 +15154,8 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
                 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)",
+                        (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
 #endif
-                    //    (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
-
                     if (damage > 0)
                     {
                         HandleAuraRaidProcFromChargeWithValue(triggeredByAura);
@@ -15168,9 +15167,8 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u
                 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
                     sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)",
+                        (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
 #endif
-                    //    (isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
-
                     HandleAuraRaidProcFromCharge(triggeredByAura);
                     takeCharges = true;
                     break;
diff --git a/src/game/Entities/Vehicle/Vehicle.cpp b/src/game/Entities/Vehicle/Vehicle.cpp
index 5d61c40a9f..b1975b91a2 100644
--- a/src/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/game/Entities/Vehicle/Vehicle.cpp
@@ -310,8 +310,9 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
     if (_status == STATUS_UNINSTALLING)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-        sLog->outError(LOG_FILTER_VEHICLES, "Passenger GuidLow: %u, Entry: %u, attempting to board vehicle GuidLow: %u, Entry: %u during uninstall! SeatId: %i", unit->GetGUIDLow(), unit->GetEntry(), _me->GetGUIDLow(), _me->GetEntry(), (int32)seatId);
-#endif        return false;
+        sLog->outDebug(LOG_FILTER_VEHICLES, "Passenger GuidLow: %u, Entry: %u, attempting to board vehicle GuidLow: %u, Entry: %u during uninstall! SeatId: %i", unit->GetGUIDLow(), unit->GetEntry(), _me->GetGUIDLow(), _me->GetEntry(), (int32)seatId);
+        return false;
+#endif
     }
 
     if (unit->GetVehicle() != this)
diff --git a/src/game/Guilds/Guild.cpp b/src/game/Guilds/Guild.cpp
index e80f36134d..bbbb78ed9c 100644
--- a/src/game/Guilds/Guild.cpp
+++ b/src/game/Guilds/Guild.cpp
@@ -565,9 +565,8 @@ void Guild::BankTab::SendText(Guild const* guild, WorldSession* session) const
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDebug(LOG_FILTER_GUILD, "MSG_QUERY_GUILD_BANK_TEXT [%s]: Tabid: %u, Text: %s"
-#endif
-        //    , session->GetPlayerInfo().c_str(), m_tabId, m_text.c_str());
-        session->SendPacket(&data);
+            , session->GetPlayerInfo().c_str(), m_tabId, m_text.c_str());
+#endif        session->SendPacket(&data);
     }
     else
     {
@@ -961,9 +960,8 @@ Item* Guild::BankMoveItemData::StoreItem(SQLTransaction& trans, Item* pItem)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDebug(LOG_FILTER_GUILD, "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u",
-#endif
-        //    m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
-        pLastItem = _StoreItem(trans, pTab, pItem, pos, itr != m_vec.end());
+            m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
+#endif        pLastItem = _StoreItem(trans, pTab, pItem, pos, itr != m_vec.end());
     }
     return pLastItem;
 }
@@ -1066,9 +1064,8 @@ InventoryResult Guild::BankMoveItemData::CanStore(Item* pItem, bool swap)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "GUILD STORAGE: CanStore() tab = %u, slot = %u, item = %u, count = %u",
+        m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
 #endif
-    //    m_container, m_slotId, pItem->GetEntry(), pItem->GetCount());
-
     uint32 count = pItem->GetCount();
     // Soulbound items cannot be moved
     if (pItem->IsSoulBound())
@@ -1166,9 +1163,8 @@ bool Guild::Create(Player* pLeader, std::string const& name)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "GUILD: creating guild [%s] for leader %s (%u)",
+        name.c_str(), pLeader->GetName().c_str(), GUID_LOPART(m_leaderGuid));
 #endif
-    //    name.c_str(), pLeader->GetName().c_str(), GUID_LOPART(m_leaderGuid));
-
     SQLTransaction trans = CharacterDatabase.BeginTransaction();
 
     PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GUILD_MEMBERS);
@@ -2905,9 +2901,8 @@ void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/
         session->SendPacket(&data);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
        sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LIST [%s]: TabId: %u, FullSlots: %u, slots: %d",
-#endif
-        //               session->GetPlayerInfo().c_str(), tabId, sendAllSlots, numSlots);
-    }
+                       session->GetPlayerInfo().c_str(), tabId, sendAllSlots, numSlots);
+#endif    }
     else // TODO - Probably this is just sent to session + those that have sent CMSG_GUILD_BANKER_ACTIVATE
     {
         for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
@@ -2923,9 +2918,8 @@ void Guild::_SendBankList(WorldSession* session /* = NULL*/, uint8 tabId /*= 0*/
             player->GetSession()->SendPacket(&data);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
            sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_BANK_LIST [%s]: TabId: %u, FullSlots: %u, slots: %u"
-#endif
-           //     , player->GetName().c_str(), tabId, sendAllSlots, numSlots);
-        }
+                , player->GetName().c_str(), tabId, sendAllSlots, numSlots);
+#endif        }
     }
 }
 
diff --git a/src/game/Handlers/ChannelHandler.cpp b/src/game/Handlers/ChannelHandler.cpp
index 58c2819cc0..36a252dd73 100644
--- a/src/game/Handlers/ChannelHandler.cpp
+++ b/src/game/Handlers/ChannelHandler.cpp
@@ -58,9 +58,8 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_LEAVE_CHANNEL %s Channel: %s, unk1: %u",
+        GetPlayerInfo().c_str(), channelName.c_str(), unk);
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), unk);
-
     if (channelName.empty())
         return;
 
@@ -78,10 +77,9 @@ void WorldSession::HandleChannelList(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "%s %s Channel: %s",
+        recvPacket.GetOpcode() == CMSG_CHANNEL_DISPLAY_LIST ? "CMSG_CHANNEL_DISPLAY_LIST" : "CMSG_CHANNEL_LIST",
+        GetPlayerInfo().c_str(), channelName.c_str());
 #endif
-    //    recvPacket.GetOpcode() == CMSG_CHANNEL_DISPLAY_LIST ? "CMSG_CHANNEL_DISPLAY_LIST" : "CMSG_CHANNEL_LIST",
-    //    GetPlayerInfo().c_str(), channelName.c_str());
-
     if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
         if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
             channel->List(GetPlayer());
@@ -94,9 +92,8 @@ void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_PASSWORD %s Channel: %s, Password: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), password.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), password.c_str());
-
     if (password.length() > MAX_CHANNEL_PASS_STR)
         return;
 
@@ -112,9 +109,8 @@ void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_SET_OWNER %s Channel: %s, Target: %s",
-#endif
     //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
+#endif
     if (!normalizePlayerName(targetName))
         return;
 
@@ -130,9 +126,8 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_OWNER %s Channel: %s",
+        GetPlayerInfo().c_str(), channelName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str());
-
     if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
         if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
             channel->SendWhoOwner(GetPlayer()->GetGUID());
@@ -145,9 +140,8 @@ void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MODERATOR %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -163,9 +157,8 @@ void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMODERATOR %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -181,9 +174,8 @@ void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_MUTE %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -199,9 +191,8 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNMUTE %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -217,9 +208,8 @@ void WorldSession::HandleChannelInvite(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_INVITE %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -235,9 +225,8 @@ void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_KICK %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-     //   GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -253,9 +242,8 @@ void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_BAN %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -271,9 +259,8 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_UNBAN %s Channel: %s, Target: %s",
+        GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str(), targetName.c_str());
-
     if (!normalizePlayerName(targetName))
         return;
 
@@ -289,9 +276,8 @@ void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_CHANNEL_ANNOUNCEMENTS %s Channel: %s",
+        GetPlayerInfo().c_str(), channelName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str());
-
     if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
         if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
             channel->Announce(GetPlayer());
@@ -310,9 +296,8 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_CHATSYS, "CMSG_GET_CHANNEL_MEMBER_COUNT %s Channel: %s",
+        GetPlayerInfo().c_str(), channelName.c_str());
 #endif
-    //    GetPlayerInfo().c_str(), channelName.c_str());
-
     if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))
     {
         if (Channel* channel = cMgr->GetChannel(channelName, GetPlayer()))
diff --git a/src/game/Handlers/GuildHandler.cpp b/src/game/Handlers/GuildHandler.cpp
index 6a4c3ad47a..0cbbc29296 100644
--- a/src/game/Handlers/GuildHandler.cpp
+++ b/src/game/Handlers/GuildHandler.cpp
@@ -206,9 +206,8 @@ void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_SET_OFFICER_NOTE [%s]: Target: %s, Note: %s",
+         GetPlayerInfo().c_str(), playerName.c_str(), note.c_str());
 #endif
-    //     GetPlayerInfo().c_str(), playerName.c_str(), note.c_str());
-
     if (normalizePlayerName(playerName))
         if (Guild* guild = GetPlayer()->GetGuild())
             guild->HandleSetMemberNote(this, playerName, note, false);
@@ -301,12 +300,11 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "MSG_SAVE_GUILD_EMBLEM [%s]: Guid: [" UI64FMTD
+        "] Style: %d, Color: %d, BorderStyle: %d, BorderColor: %d, BackgroundColor: %d"
+        , GetPlayerInfo().c_str(), vendorGuid, emblemInfo.GetStyle()
+        , emblemInfo.GetColor(), emblemInfo.GetBorderStyle()
+        , emblemInfo.GetBorderColor(), emblemInfo.GetBackgroundColor());
 #endif
-     //   "] Style: %d, Color: %d, BorderStyle: %d, BorderColor: %d, BackgroundColor: %d"
-     //   , GetPlayerInfo().c_str(), vendorGuid, emblemInfo.GetStyle()
-     //   , emblemInfo.GetColor(), emblemInfo.GetBorderStyle()
-      //  , emblemInfo.GetBorderColor(), emblemInfo.GetBackgroundColor());
-
     if (GetPlayer()->GetNPCIfCanInteractWith(vendorGuid, UNIT_NPC_FLAG_TABARDDESIGNER))
     {
         // Remove fake death
@@ -361,9 +359,8 @@ void WorldSession::HandleGuildBankerActivate(WorldPacket& recvData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANKER_ACTIVATE [%s]: Go: [" UI64FMTD "] AllSlots: %u"
+        , GetPlayerInfo().c_str(), guid, sendAllSlots);
 #endif
-    //    , GetPlayerInfo().c_str(), guid, sendAllSlots);
-
     Guild * const guild = GetPlayer()->GetGuild();
     if (!guild)
     {
@@ -385,9 +382,8 @@ void WorldSession::HandleGuildBankQueryTab(WorldPacket& recvData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_QUERY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u, ShowTabs: %u"
+       , GetPlayerInfo().c_str(), guid, tabId, full);
 #endif
-     //   , GetPlayerInfo().c_str(), guid, tabId, full);
-
     if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
         if (Guild* guild = GetPlayer()->GetGuild())
             guild->SendBankTabData(this, tabId);
@@ -401,9 +397,8 @@ void WorldSession::HandleGuildBankDepositMoney(WorldPacket& recvData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_DEPOSIT_MONEY [%s]: Go: [" UI64FMTD "], money: %u",
+        GetPlayerInfo().c_str(), guid, money);
 #endif
-   //     GetPlayerInfo().c_str(), guid, money);
-
     if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
         if (money && GetPlayer()->HasEnoughMoney(money))
             if (Guild* guild = GetPlayer()->GetGuild())
@@ -418,9 +413,8 @@ void WorldSession::HandleGuildBankWithdrawMoney(WorldPacket& recvData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_WITHDRAW_MONEY [%s]: Go: [" UI64FMTD "], money: %u",
+        GetPlayerInfo().c_str(), guid, money);
 #endif
-   //     GetPlayerInfo().c_str(), guid, money);
-
     if (money && GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
         if (Guild* guild = GetPlayer()->GetGuild())
             guild->HandleMemberWithdrawMoney(this, money);
@@ -536,9 +530,8 @@ void WorldSession::HandleGuildBankUpdateTab(WorldPacket& recvData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_UPDATE_TAB [%s]: Go: [" UI64FMTD "], TabId: %u, Name: %s, Icon: %s"
+        , GetPlayerInfo().c_str(), guid, tabId, name.c_str(), icon.c_str());
 #endif
-    //    , GetPlayerInfo().c_str(), guid, tabId, name.c_str(), icon.c_str());
-
     if (!name.empty() && !icon.empty())
         if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
             if (Guild* guild = GetPlayer()->GetGuild())
diff --git a/src/game/Handlers/LFGHandler.cpp b/src/game/Handlers/LFGHandler.cpp
index f2d685232f..1142602234 100644
--- a/src/game/Handlers/LFGHandler.cpp
+++ b/src/game/Handlers/LFGHandler.cpp
@@ -110,7 +110,7 @@ void WorldSession::HandleLfgProposalResultOpcode(WorldPacket& recvData)
     recvData >> accept;
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-    sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PROPOSAL_RESULT [" UI64FMTD "] proposal: %u accept: %u", GetPlayer()->GetGUID(), lfgGroupID, accept ? 1 : 0);
+    sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LFG_PROPOSAL_RESULT [" UI64FMTD "] proposal: %u accept: %u", GetPlayer()->GetGUID(), proposalID, accept ? 1 : 0);
 #endif
     sLFGMgr->UpdateProposal(proposalID, GetPlayer()->GetGUID(), accept);
 }
@@ -137,6 +137,7 @@ void WorldSession::HandleLfgSetRolesOpcode(WorldPacket& recvData)
 
 void WorldSession::HandleLfgSetCommentOpcode(WorldPacket&  recvData)
 {
+    uint64 guid = GetPlayer()->GetGUID();
     std::string comment;
     recvData >> comment;
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
@@ -343,9 +344,8 @@ void WorldSession::SendLfgUpdatePlayer(lfg::LfgUpdateData const& updateData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_LFG, "SMSG_LFG_UPDATE_PLAYER %s updatetype: %u",
-#endif
-    //    GetPlayerInfo().c_str(), updateData.updateType);
-    WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + updateData.comment.length()));
+        GetPlayerInfo().c_str(), updateData.updateType);
+#endif    WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + updateData.comment.length()));
     data << uint8(updateData.updateType);                  // Lfg Update type
     data << uint8(size > 0);                               // Extra info
     if (size)
@@ -386,9 +386,8 @@ void WorldSession::SendLfgUpdateParty(lfg::LfgUpdateData const& updateData)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_LFG, "SMSG_LFG_UPDATE_PARTY %s updatetype: %u",
-#endif
-    //    GetPlayerInfo().c_str(), updateData.updateType);
-    WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + updateData.comment.length()));
+        GetPlayerInfo().c_str(), updateData.updateType);
+#endif    WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (size > 0 ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + updateData.comment.length()));
     data << uint8(updateData.updateType);                  // Lfg Update type
     data << uint8(size > 0);                               // Extra info
     if (size)
@@ -491,9 +490,8 @@ void WorldSession::SendLfgQueueStatus(lfg::LfgQueueStatusData const& queueData)
 {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_QUEUE_STATUS [" UI64FMTD "] dungeon: %u - waitTime: %d - avgWaitTime: %d - waitTimeTanks: %d - waitTimeHealer: %d - waitTimeDps: %d - queuedTime: %u - tanks: %u - healers: %u - dps: %u",
+        GetPlayer()->GetGUID(), queueData.dungeonId, queueData.waitTime, queueData.waitTimeAvg, queueData.waitTimeTank, queueData.waitTimeHealer, queueData.waitTimeDps, queueData.queuedTime, queueData.tanks, queueData.healers, queueData.dps);
 #endif
-     //   GetPlayer()->GetGUID(), queueData.dungeonId, queueData.waitTime, queueData.waitTimeAvg, queueData.waitTimeTank, queueData.waitTimeHealer, queueData.waitTimeDps, queueData.queuedTime, queueData.tanks, queueData.healers, queueData.dps);
-
     WorldPacket data(SMSG_LFG_QUEUE_STATUS, 4 + 4 + 4 + 4 + 4 +4 + 1 + 1 + 1 + 4);
     data << uint32(queueData.dungeonId);                   // Dungeon
     data << int32(queueData.waitTimeAvg);                  // Average Wait time
@@ -560,9 +558,8 @@ void WorldSession::SendLfgBootProposalUpdate(lfg::LfgPlayerBoot const& boot)
     }
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_NETWORKIO, "SMSG_LFG_BOOT_PROPOSAL_UPDATE [" UI64FMTD "] inProgress: %u - didVote: %u - agree: %u - victim: [" UI64FMTD "] votes: %u - agrees: %u - left: %u - needed: %u - reason %s",
-#endif
-     //   guid, uint8(boot.inProgress), uint8(playerVote != lfg::LFG_ANSWER_PENDING), uint8(playerVote == lfg::LFG_ANSWER_AGREE), boot.victim, votesNum, agreeNum, secsleft, lfg::LFG_GROUP_KICK_VOTES_NEEDED, boot.reason.c_str());
-    WorldPacket data(SMSG_LFG_BOOT_PROPOSAL_UPDATE, 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + boot.reason.length());
+        guid, uint8(boot.inProgress), uint8(playerVote != lfg::LFG_ANSWER_PENDING), uint8(playerVote == lfg::LFG_ANSWER_AGREE), boot.victim, votesNum, agreeNum, secsleft, lfg::LFG_GROUP_KICK_VOTES_NEEDED, boot.reason.c_str());
+#endif    WorldPacket data(SMSG_LFG_BOOT_PROPOSAL_UPDATE, 1 + 1 + 1 + 8 + 4 + 4 + 4 + 4 + boot.reason.length());
     data << uint8(boot.inProgress);                        // Vote in progress
     data << uint8(playerVote != lfg::LFG_ANSWER_PENDING);       // Did Vote
     data << uint8(playerVote == lfg::LFG_ANSWER_AGREE);         // Agree
diff --git a/src/game/Handlers/MiscHandler.cpp b/src/game/Handlers/MiscHandler.cpp
index 2fa32ba9e8..494832deac 100644
--- a/src/game/Handlers/MiscHandler.cpp
+++ b/src/game/Handlers/MiscHandler.cpp
@@ -884,9 +884,8 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",
-#endif
-        //    player->GetName().c_str(), player->GetGUIDLow(), triggerId);
-        return;
+            player->GetName().c_str(), player->GetGUIDLow(), triggerId);
+#endif        return;
     }
 
     AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(triggerId);
@@ -894,18 +893,16 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket& recv_data)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u",
-#endif
-        //    player->GetName().c_str(), player->GetGUIDLow(), triggerId);
-        return;
+            player->GetName().c_str(), player->GetGUIDLow(), triggerId);
+#endif        return;
     }
 
     if (!player->IsInAreaTriggerRadius(atEntry))
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleAreaTriggerOpcode: Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u",
-#endif
-        //    player->GetName().c_str(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId);
-        return;
+            player->GetName().c_str(), atEntry->mapid, player->GetMapId(), player->GetGUIDLow(), triggerId);
+#endif        return;
     }
 
     if (player->isDebugAreaTriggers)
diff --git a/src/game/Handlers/PetitionsHandler.cpp b/src/game/Handlers/PetitionsHandler.cpp
index 0e87f23f1b..8a9b6e8b17 100644
--- a/src/game/Handlers/PetitionsHandler.cpp
+++ b/src/game/Handlers/PetitionsHandler.cpp
@@ -832,7 +832,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData)
             for (SignatureMap::const_iterator itr = signatureCopy.begin(); itr != signatureCopy.end(); ++itr)
             {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
-                sLog->outDebug(LOG_FILTER_NETWORKIO, "PetitionsHandler: Adding arena team (guid: %u) member %u", arenaTeam->GetId(), memberGUID);
+                sLog->outDebug(LOG_FILTER_NETWORKIO, "PetitionsHandler: Adding arena team (guid: %u) member %u", arenaTeam->GetId());
 #endif
                 arenaTeam->AddMember(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
             }
diff --git a/src/game/Handlers/QueryHandler.cpp b/src/game/Handlers/QueryHandler.cpp
index 3b341d0d60..962ebdc942 100644
--- a/src/game/Handlers/QueryHandler.cpp
+++ b/src/game/Handlers/QueryHandler.cpp
@@ -205,9 +205,8 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket & recvData)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GAMEOBJECT_QUERY - Missing gameobject info for (GUID: %u, ENTRY: %u)",
-#endif
-        //    GUID_LOPART(guid), entry);
-        WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 4);
+           GUID_LOPART(guid), entry);
+#endif        WorldPacket data (SMSG_GAMEOBJECT_QUERY_RESPONSE, 4);
         data << uint32(entry | 0x80000000);
         SendPacket(&data);
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
diff --git a/src/game/Movement/MotionMaster.cpp b/src/game/Movement/MotionMaster.cpp
index 829fd75c8b..67909a66af 100644
--- a/src/game/Movement/MotionMaster.cpp
+++ b/src/game/Movement/MotionMaster.cpp
@@ -301,21 +301,19 @@ void MotionMaster::MoveChase(Unit* target, float dist, float angle)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Player (GUID: %u) chase to %s (GUID: %u)",
-#endif
-        //    _owner->GetGUIDLow(),
-        //    target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
-        //    target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
-        Mutate(new ChaseMovementGenerator<Player>(target, dist, angle), MOTION_SLOT_ACTIVE);
+            _owner->GetGUIDLow(),
+            target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
+            target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
+#endif        Mutate(new ChaseMovementGenerator<Player>(target, dist, angle), MOTION_SLOT_ACTIVE);
     }
     else
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) chase to %s (GUID: %u)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(),
-        //    target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
-        //    target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
-        Mutate(new ChaseMovementGenerator<Creature>(target, dist, angle), MOTION_SLOT_ACTIVE);
+            _owner->GetEntry(), _owner->GetGUIDLow(),
+            target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
+            target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
+#endif        Mutate(new ChaseMovementGenerator<Creature>(target, dist, angle), MOTION_SLOT_ACTIVE);
     }
 }
 
@@ -331,20 +329,18 @@ void MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlo
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Player (GUID: %u) follow to %s (GUID: %u)", _owner->GetGUIDLow(),
-#endif
-        //    target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
-        //    target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
-        Mutate(new FollowMovementGenerator<Player>(target, dist, angle), slot);
+            target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
+            target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
+#endif        Mutate(new FollowMovementGenerator<Player>(target, dist, angle), slot);
     }
     else
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) follow to %s (GUID: %u)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(),
-        //    target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
-        //    target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
-        Mutate(new FollowMovementGenerator<Creature>(target, dist, angle), slot);
+            _owner->GetEntry(), _owner->GetGUIDLow(),
+            target->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
+            target->GetTypeId() == TYPEID_PLAYER ? target->GetGUIDLow() : target->ToCreature()->GetDBTableGUIDLow());
+#endif        Mutate(new FollowMovementGenerator<Creature>(target, dist, angle), slot);
     }
 }
 
@@ -365,14 +361,16 @@ void MotionMaster::MovePoint(uint32 id, float x, float y, float z, bool generate
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z);
-        Mutate(new PointMovementGenerator<Creature>(id, x, y, z, 0.0f, NULL, generatePath, forceDestination), slot);
+            _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z);
+#endif        Mutate(new PointMovementGenerator<Creature>(id, x, y, z, 0.0f, NULL, generatePath, forceDestination), slot);
     }
 }
 
 void MotionMaster::MoveSplinePath(Movement::PointsArray* path)
 {
+    uint32 id;
+    float x, y, z;
+
     // Xinef: do not allow to move with UNIT_FLAG_DISABLE_MOVE
     if (_owner->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
         return;
@@ -388,9 +386,8 @@ void MotionMaster::MoveSplinePath(Movement::PointsArray* path)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) targeted point (ID: %u X: %f Y: %f Z: %f)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z);
-        Mutate(new EscortMovementGenerator<Creature>(path), MOTION_SLOT_ACTIVE);
+            _owner->GetEntry(), _owner->GetGUIDLow(), id, x, y, z);
+#endif        Mutate(new EscortMovementGenerator<Creature>(path), MOTION_SLOT_ACTIVE);
     }
 }
 
@@ -528,9 +525,8 @@ void MotionMaster::MoveFall(uint32 id /*=0*/, bool addFlagForNPC)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("MotionMaster::MoveFall: unable retrive a proper height at map %u (x: %f, y: %f, z: %f).",
-#endif
-        //    _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionX(), _owner->GetPositionZ());
-        return;
+            _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionX(), _owner->GetPositionZ());
+#endif        return;
     }
 
     // Abort too if the ground is very near
@@ -579,9 +575,8 @@ void MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id,
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) charge point (X: %f Y: %f Z: %f)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z);
-        Mutate(new PointMovementGenerator<Creature>(id, x, y, z, speed, path, generatePath, generatePath), MOTION_SLOT_CONTROLLED);
+            _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z);
+#endif        Mutate(new PointMovementGenerator<Creature>(id, x, y, z, speed, path, generatePath, generatePath), MOTION_SLOT_CONTROLLED);
     }
 }
 
@@ -599,9 +594,8 @@ void MotionMaster::MoveSeekAssistance(float x, float y, float z)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) seek assistance (X: %f Y: %f Z: %f)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z);
-        _owner->AttackStop();
+            _owner->GetEntry(), _owner->GetGUIDLow(), x, y, z);
+#endif        _owner->AttackStop();
         _owner->CastStop(0, false);
         _owner->ToCreature()->SetReactState(REACT_PASSIVE);
         Mutate(new AssistanceMovementGenerator(x, y, z), MOTION_SLOT_ACTIVE);
@@ -622,9 +616,8 @@ void MotionMaster::MoveSeekAssistanceDistract(uint32 time)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) is distracted after assistance call (Time: %u)",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(), time);
-        Mutate(new AssistanceDistractMovementGenerator(time), MOTION_SLOT_ACTIVE);
+            _owner->GetEntry(), _owner->GetGUIDLow(), time);
+#endif        Mutate(new AssistanceDistractMovementGenerator(time), MOTION_SLOT_ACTIVE);
     }
 }
 
@@ -641,21 +634,19 @@ void MotionMaster::MoveFleeing(Unit* enemy, uint32 time)
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Player (GUID: %u) flee from %s (GUID: %u)", _owner->GetGUIDLow(),
-#endif
-        //    enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
-        //    enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow());
-        Mutate(new FleeingMovementGenerator<Player>(enemy->GetGUID()), MOTION_SLOT_CONTROLLED);
+            enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
+            enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow());
+#endif        Mutate(new FleeingMovementGenerator<Player>(enemy->GetGUID()), MOTION_SLOT_CONTROLLED);
     }
     else
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outStaticDebug("Creature (Entry: %u GUID: %u) flee from %s (GUID: %u)%s",
-#endif
-        //    _owner->GetEntry(), _owner->GetGUIDLow(),
-        //    enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
-        //    enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow(),
-        //    time ? " for a limited time" : "");
-        if (time)
+            _owner->GetEntry(), _owner->GetGUIDLow(),
+            enemy->GetTypeId() == TYPEID_PLAYER ? "player" : "creature",
+            enemy->GetTypeId() == TYPEID_PLAYER ? enemy->GetGUIDLow() : enemy->ToCreature()->GetDBTableGUIDLow(),
+            time ? " for a limited time" : "");
+#endif        if (time)
             Mutate(new TimedFleeingMovementGenerator(enemy->GetGUID(), time), MOTION_SLOT_CONTROLLED);
         else
             Mutate(new FleeingMovementGenerator<Creature>(enemy->GetGUID()), MOTION_SLOT_CONTROLLED);
@@ -771,10 +762,9 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outStaticDebug("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)",
-#endif
-    //    _owner->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature",
-    //    _owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO");
-}
+        _owner->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature",
+        _owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO");
+#endif}
 
 void MotionMaster::MoveRotate(uint32 time, RotateDirection direction)
 {
diff --git a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 17b10e81b1..ffa91d291c 100644
--- a/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -481,7 +481,7 @@ void FlightPathMovementGenerator::PreloadEndGrid()
     {
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
         sLog->outDetail("Preloading rid (%f, %f) for map %u at node index %u/%u", _endGridX, _endGridY, _endMapId, _preloadTargetNode, (uint32)(i_path->size()-1));
-#endif
+#endi
         endMap->LoadGrid(_endGridX, _endGridY);
     }
     else
diff --git a/src/game/Server/WorldSocket.cpp b/src/game/Server/WorldSocket.cpp
index 91c5efe6a2..928f8b5b54 100644
--- a/src/game/Server/WorldSocket.cpp
+++ b/src/game/Server/WorldSocket.cpp
@@ -920,10 +920,9 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outStaticDebug("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
+                account.c_str(),
+                address.c_str());
 #endif
-    //            account.c_str(),
-    //            address.c_str());
-
     // Check if this user is by any chance a recruiter
     stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_ACCOUNT_RECRUITER);
 
diff --git a/src/game/Spells/Auras/SpellAuraEffects.cpp b/src/game/Spells/Auras/SpellAuraEffects.cpp
index 4790865244..070b155747 100644
--- a/src/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/game/Spells/Auras/SpellAuraEffects.cpp
@@ -6140,9 +6140,8 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDetail("PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
+        GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb);
 #endif
-    //    GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb);
-
     Unit::DealDamageMods(target, damage, &absorb);
 
     // Auras reducing damage from AOE spells
@@ -6237,9 +6236,8 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDetail("PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
+        GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb);
 #endif
-    //    GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId(), absorb);
-
     if (caster)
         caster->SendSpellNonMeleeDamageLog(target, GetId(), damage+absorb+resist, GetSpellInfo()->GetSchoolMask(), absorb, resist, false, 0, crit);
 
@@ -6386,9 +6384,8 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDetail("PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health inflicted by %u",
+      GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId());
 #endif
-    //  GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), damage, GetId());
-
     uint32 absorb = 0;
     uint32 heal = uint32(damage);
 
@@ -6467,9 +6464,8 @@ void AuraEffect::HandlePeriodicManaLeechAuraTick(Unit* target, Unit* caster) con
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDetail("PeriodicTick: %u (TypeId: %u) power leech of %u (TypeId: %u) for %u dmg inflicted by %u",
+        GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), drainAmount, GetId());
 #endif
-    //    GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), drainAmount, GetId());
-
     // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
     if (powerType == POWER_MANA)
         drainAmount -= target->GetSpellCritDamageReduction(drainAmount);
@@ -6535,9 +6531,8 @@ void AuraEffect::HandleObsModPowerAuraTick(Unit* target, Unit* caster) const
     uint32 amount = std::max(m_amount, 0) * target->GetMaxPower(powerType) /100;
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u",
+        GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId());
 #endif
-    //    GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId());
-
     SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false);
     target->SendPeriodicAuraLog(&pInfo);
 
@@ -6575,9 +6570,8 @@ void AuraEffect::HandlePeriodicEnergizeAuraTick(Unit* target, Unit* caster) cons
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u",
+        GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId());
 #endif
-    //    GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), amount, GetId());
-
     int32 gain = target->ModifyPower(powerType, amount);
 
     if (caster)
diff --git a/src/game/Spells/SpellEffects.cpp b/src/game/Spells/SpellEffects.cpp
index 235f5e990e..3136acb94a 100644
--- a/src/game/Spells/SpellEffects.cpp
+++ b/src/game/Spells/SpellEffects.cpp
@@ -6197,9 +6197,8 @@ void Spell::EffectBind(SpellEffIndex effIndex)
 
 #ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
     sLog->outDebug(LOG_FILTER_SPELLS_AURAS, "EffectBind: New homebind X: %f, Y: %f, Z: %f, MapId: %u, AreaId: %u",
+        homeLoc.GetPositionX(), homeLoc.GetPositionY(), homeLoc.GetPositionZ(), homeLoc.GetMapId(), areaId);
 #endif
-    //    homeLoc.GetPositionX(), homeLoc.GetPositionY(), homeLoc.GetPositionZ(), homeLoc.GetMapId(), areaId);
-
     // zone update
     data.Initialize(SMSG_PLAYERBOUND, 8 + 4);
     data << uint64(m_caster->GetGUID());
author	talamortis <talamortis@gmail.com>	2017-06-30 20:06:12 +0100
committer	Yehonal <yehonal.azeroth@gmail.com>	2017-08-20 02:33:48 +0200
commit	e471c1bb6a241cfffe9c7ae61aa502eba9a046a0 (patch)
tree	2142523ff7d35b34e9b3789c813939e84c405e16
parent	bf80a43d7861e6d53946e156b80ed5be3f2a2127 (diff)