Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk

1 files changed, 9 insertions, 5 deletions

diff --git a/src/scripts/Commands/cs_misc.cpp b/src/scripts/Commands/cs_misc.cpp
index f7eb61d7d8..edf4851914 100644
--- a/src/scripts/Commands/cs_misc.cpp
+++ b/src/scripts/Commands/cs_misc.cpp
@@ -688,12 +688,16 @@ public:
             }
             else if (map->IsDungeon())
             {
-                // pussywizard: prevent unbinding normal player's perm bind by just summoning him >_>
-                if (!target->GetSession()->GetSecurity())
+                // Allow GM to summon players or only other GM accounts inside instances.
+                if (!sWorld->getBoolConfig(CONFIG_INSTANCE_GMSUMMON_PLAYER))
                 {
-                    handler->PSendSysMessage("Only GMs can be summoned to an instance!");
-                    handler->SetSentErrorMessage(true);
-                    return false;
+                    // pussywizard: prevent unbinding normal player's perm bind by just summoning him >_>
+                    if (!target->GetSession()->GetSecurity())
+                    {
+                        handler->PSendSysMessage("Only GMs can be summoned to an instance!");
+                        handler->SetSentErrorMessage(true);
+                        return false;
+                    }
                 }
 
                 Map* destMap = target->GetMap();