Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp

2 files changed, 26 insertions, 17 deletions

diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp
index 2b8bf7f7233..5b58ccf6474 100644
--- a/src/server/scripts/Commands/cs_gm.cpp
+++ b/src/server/scripts/Commands/cs_gm.cpp
@@ -195,33 +195,34 @@ public:
     //Enable\Disable Invisible mode
     static bool HandleGMVisibleCommand(ChatHandler* handler, char const* args)
     {
+        Player* _player = handler->GetSession()->GetPlayer();
+
         if (!*args)
         {
-            handler->PSendSysMessage(LANG_YOU_ARE, handler->GetSession()->GetPlayer()->isGMVisible() ? handler->GetTrinityString(LANG_VISIBLE) : handler->GetTrinityString(LANG_INVISIBLE));
+            handler->PSendSysMessage(LANG_YOU_ARE, _player->isGMVisible() ? handler->GetTrinityString(LANG_VISIBLE) : handler->GetTrinityString(LANG_INVISIBLE));
             return true;
         }
 
         const uint32 VISUAL_AURA = 37800;
         std::string param = (char*)args;
-        Player* player = handler->GetSession()->GetPlayer();
 
         if (param == "on")
         {
-            if (player->HasAura(VISUAL_AURA, 0))
-                player->RemoveAurasDueToSpell(VISUAL_AURA);
+            if (_player->HasAura(VISUAL_AURA, 0))
+                _player->RemoveAurasDueToSpell(VISUAL_AURA);
 
-            player->SetGMVisible(true);
+            _player->SetGMVisible(true);
+            _player->UpdateObjectVisibility();
             handler->GetSession()->SendNotification(LANG_INVISIBLE_VISIBLE);
             return true;
         }
 
         if (param == "off")
         {
+            _player->AddAura(VISUAL_AURA, _player);
+            _player->SetGMVisible(false);
+            _player->UpdateObjectVisibility();
             handler->GetSession()->SendNotification(LANG_INVISIBLE_INVISIBLE);
-            player->SetGMVisible(false);
-
-            player->AddAura(VISUAL_AURA, player);
-
             return true;
         }
 
@@ -233,12 +234,11 @@ public:
     //Enable\Disable GM Mode
     static bool HandleGMCommand(ChatHandler* handler, char const* args)
     {
+        Player* _player = handler->GetSession()->GetPlayer();
+
         if (!*args)
         {
-            if (handler->GetSession()->GetPlayer()->IsGameMaster())
-                handler->GetSession()->SendNotification(LANG_GM_ON);
-            else
-                handler->GetSession()->SendNotification(LANG_GM_OFF);
+            handler->GetSession()->SendNotification(_player->IsGameMaster() ? LANG_GM_ON : LANG_GM_OFF);
             return true;
         }
 
@@ -246,9 +246,9 @@ public:
 
         if (param == "on")
         {
-            handler->GetSession()->GetPlayer()->SetGameMaster(true);
+            _player->SetGameMaster(true);
             handler->GetSession()->SendNotification(LANG_GM_ON);
-            handler->GetSession()->GetPlayer()->UpdateTriggerVisibility();
+            _player->UpdateTriggerVisibility();
 #ifdef _DEBUG_VMAPS
             VMAP::IVMapManager* vMapManager = VMAP::VMapFactory::createOrGetVMapManager();
             vMapManager->processCommand("stoplog");
@@ -258,9 +258,9 @@ public:
 
         if (param == "off")
         {
-            handler->GetSession()->GetPlayer()->SetGameMaster(false);
+            _player->SetGameMaster(false);
             handler->GetSession()->SendNotification(LANG_GM_OFF);
-            handler->GetSession()->GetPlayer()->UpdateTriggerVisibility();
+            _player->UpdateTriggerVisibility();
 #ifdef _DEBUG_VMAPS
             VMAP::IVMapManager* vMapManager = VMAP::VMapFactory::createOrGetVMapManager();
             vMapManager->processCommand("startlog");
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 1b6a5fd9b22..67dbaacedce 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -93,6 +93,7 @@ public:
             { "unpossess",        rbac::RBAC_PERM_COMMAND_UNPOSSESS,        false, &HandleUnPossessCommand,        "", NULL },
             { "unstuck",          rbac::RBAC_PERM_COMMAND_UNSTUCK,           true, &HandleUnstuckCommand,          "", NULL },
             { "wchange",          rbac::RBAC_PERM_COMMAND_WCHANGE,          false, &HandleChangeWeather,           "", NULL },
+            { "mailbox",          rbac::RBAC_PERM_COMMAND_MAILBOX,          false, &HandleMailBoxCommand,          "", NULL },
             { NULL,               0,                                  false, NULL,                           "", NULL }
         };
         return commandTable;
@@ -2470,6 +2471,14 @@ public:
         player->StopCastingBindSight();
         return true;
     }
+
+    static bool HandleMailBoxCommand(ChatHandler* handler, char const* /*args*/)
+    {
+        Player* player = handler->GetSession()->GetPlayer();
+
+        handler->GetSession()->SendShowMailBox(player->GetGUID());
+        return true;
+    }
 };
 
 void AddSC_misc_commandscript()