4 files changed, 9 insertions, 4 deletions
diff --git a/src/bindings/scripts/Makefile.am b/src/bindings/scripts/Makefile.am
index 564fa1c16b2..ac5965336a6 100644
--- a/src/bindings/scripts/Makefile.am
+++ b/src/bindings/scripts/Makefile.am
@@ -195,6 +195,7 @@ scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp \
 scripts/zone/hellfire_citadel/blood_furnace/def_blood_furnace.h \
 scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp \
 scripts/zone/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp \
+scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp \
 scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp \
 scripts/zone/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h \
 scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp \
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index d9971518bf3..bef251bd880 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -797,6 +797,10 @@ void Map::Update(const uint32 &t_diff)
 
 void Map::Remove(Player *player, bool remove)
 {
+    player->DestroyForNearbyPlayers();
+    player->m_IsInNotifyList = false;
+    player->m_Notified = false;
+
     // this may be called during Map::Update
     // after decrement+unlink, ++m_mapRefIter will continue correctly
     // when the first element of the list is being removed
@@ -835,7 +839,7 @@ void Map::Remove(Player *player, bool remove)
     SendRemoveTransports(player);
 
     //UpdateObjectsVisibilityFor(player,cell,p);
-    AddUnitToNotify(player);
+    //AddUnitToNotify(player);
 
     if( remove )
         DeleteFromWorld(player);
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 2fac72bb3c7..405d2a72c4f 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1735,7 +1735,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
             ResetContestedPvP();
 
-            DestroyForNearbyPlayers();
+            /*DestroyForNearbyPlayers();
             {
                 UpdateData data;
                 for(ClientGUIDs::iterator i = m_clientGUIDs.begin(); i != m_clientGUIDs.end(); ++i)
@@ -1743,7 +1743,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 WorldPacket packet;
                 data.BuildPacket(&packet);
                 GetSession()->SendPacket(&packet);
-            }
+            }*/
             m_clientGUIDs.clear();
 
             // remove player from battleground on far teleport (when changing maps)
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index c3ec18ae1b7..e043bbe9659 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -255,7 +255,7 @@ void WorldSession::LogoutPlayer(bool Save)
         // Remove any possession of this player on logout
         _player->RemoveCharmedOrPossessedBy(NULL);
 
-        _player->DestroyForNearbyPlayers();
+        //_player->DestroyForNearbyPlayers();
 
         if (uint64 lguid = GetPlayer()->GetLootGUID())
             DoLootRelease(lguid);