*Add DeleteObjectWith owner function for gameobject deletion with updating owner object list

*Cleanups in Aura 1852 and recenlty added glyph code.

--HG--
branch : trunk

2 files changed, 2 insertions, 6 deletions

diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
index 8b185318b8a..b7b44da4f80 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
@@ -200,11 +200,7 @@ bool GOHello_go_najentus_spine(Player *player, GameObject* _GO)
             if(CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine())
             {
                 player->CastSpell(player, SPELL_CREATE_NAJENTUS_SPINE, true);
-                _GO->SetLootState(GO_NOT_READY);
-                if (_GO->GetOwnerGUID())
-                    if (Unit * owner = _GO->GetOwner())
-                        owner->RemoveGameObject(_GO, false);
-                _GO->Delete();
+                _GO->DeleteObjectWithOwner();
             }
     return true;
 }
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
index 05dea45ed25..47b991e8346 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
@@ -161,7 +161,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
             if(Player *player = Unit::GetPlayer(itr->first))
                 player->RemoveAura(SPELL_ICEBOLT);
             if(GameObject *go = GameObject::GetGameObject(*me, itr->second))
-                go->Delete();
+                go->DeleteObjectWithOwner();
         }
         iceblocks.clear();
     }