*Merge.

--HG--
branch : trunk

5 files changed, 7 insertions, 3 deletions

diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
index 52e6f2e363c..ec4b070a087 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
@@ -299,6 +299,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
                 if (target && target->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinMeleeRange(target))
                 {
                     DoCast(target, SPELL_BLIND);
+
                     Blind_Timer = 40000;
                 }
                 else
diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
index ae2c48742d6..a8168615a5e 100644
--- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
+++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_skeram.cpp
@@ -297,6 +297,7 @@ struct TRINITY_DLL_DECL boss_skeramAI : public ScriptedAI
         }
         Invisible = true;
     }
+
 };
 
 CreatureAI* GetAI_boss_skeram(Creature *_Creature)
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index f7c53e536c4..66b4decb56d 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -613,7 +613,6 @@ void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult *result, uint32 acc
                 }
                 session->GetPlayer()->GetSocial()->SetFriendNote(GUID_LOPART(friendGuid), friendNote);
             }
-        }
     }
 
     sSocialMgr.SendFriendStatus(session->GetPlayer(), friendResult, GUID_LOPART(friendGuid), false);
diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp
index f9f04f676ff..c1f47db49c7 100644
--- a/src/game/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvPSI.cpp
@@ -188,7 +188,10 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
                         GameObject * go = new GameObject;
                         Map * map = MapManager::Instance().GetMap(plr->GetMapId(), plr);
                         if(!map)
-                            return true;
+                        {
+                          delete go;
+                          return true;
+                          }
                         if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask() ,plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
                         {
                             delete go;
diff --git a/src/game/World.h b/src/game/World.h
index 2c0889e0e9f..827d9157792 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -141,9 +141,9 @@ enum WorldConfigs
     CONFIG_GM_IN_GM_LIST,
     CONFIG_GM_IN_WHO_LIST,
     CONFIG_GM_LOG_TRADE,
+    CONFIG_START_GM_LEVEL,
     CONFIG_ALLOW_GM_GROUP,
     CONFIG_ALLOW_GM_FRIEND,
-    CONFIG_START_GM_LEVEL,
     CONFIG_GM_LOWER_SECURITY,
     CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS,
     CONFIG_GROUP_VISIBILITY,