Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h

3 files changed, 5 insertions, 4 deletions

diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 7a34ba55110..d41c9c5d2c2 100644
--- a/src/server/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
@@ -211,7 +211,7 @@ public:
         return true;
     }
 
-    static bool HandleLearnAllMyPetTalentsCommand(ChatHandler* handler, char const* /*args*/)
+    static bool HandleLearnAllMyPetTalentsCommand(ChatHandler* /*handler*/, char const* /*args*/)
     {
         /* TODO: 6.x remove pet talents
         Player* player = handler->GetSession()->GetPlayer();
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index d437e72b933..b57efc07a74 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -238,7 +238,8 @@ public:
             zoneId, (zoneEntry ? zoneEntry->ZoneName : unknown),
             areaId, (areaEntry ? areaEntry->ZoneName : unknown),
             object->GetPhaseMask(),
-            object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(),
+            object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
+        handler->PSendSysMessage(LANG_GRID_POSITION,
             cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(),
             zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap);
 
@@ -2625,7 +2626,7 @@ public:
         return true;
     }
 
-    static bool HandleAurasCommand(ChatHandler* handler, char const* args)
+    static bool HandleAurasCommand(ChatHandler* handler, char const* /*args*/)
     {
         Unit* target = handler->GetSession()->GetPlayer()->GetSelectedUnit();
 
diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp
index 5af9b150572..c1f90c7ac96 100644
--- a/src/server/scripts/Commands/cs_modify.cpp
+++ b/src/server/scripts/Commands/cs_modify.cpp
@@ -418,7 +418,7 @@ public:
     }
 
     //Edit Player TP
-    static bool HandleModifyTalentCommand (ChatHandler* handler, const char* args)
+    static bool HandleModifyTalentCommand(ChatHandler* /*handler*/, const char* /*args*/)
     {
         /* TODO: 6.x remove this
         if (!*args)