*Do not create new instance when player is logging in. (Try to fix "Instance Relog & Reset Exploit")

--HG--
branch : trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index 7b8f5fb9b64..06d38ed791a 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -179,13 +179,18 @@ Map* MapInstanced::GetInstance(const WorldObject* obj)
                     map = CreateInstance(NewInstanceId, pSave, pSave->GetDifficulty());
                 return map;
             }
-            else
+            else if(!player->GetSession()->PlayerLoading())
             {
                 // if no instanceId via group members or instance saves is found
                 // the instance will be created for the first time
                 NewInstanceId = MapManager::Instance().GenerateInstanceId();
                 return CreateInstance(NewInstanceId, NULL, player->GetDifficulty());
             }
+            else
+            {
+                sLog.outError("MAPINSTANCED: Player %s is trying to create instance (MapId %u) when login.", player->GetName(), player->GetMapId());
+                return NULL;
+            }
         }
     }
 }