Scripts/Ulduar: Add proper support for Razorscale harpoon event.

Add script for Razorscale Controller.
Add spell script for Devouring Flame.
A little code cleanup in script

1 files changed, 6 insertions, 3 deletions

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 82ad16cc624..ed5442442fe 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -537,8 +537,12 @@ void GameObject::Update(uint32 diff)
                 SetGoState(GO_STATE_READY);
 
                 //any return here in case battleground traps
+                if (GetGOInfo()->flags & GO_FLAG_NODESPAWN)
+                    return;
             }
 
+            loot.clear();
+
             if (GetOwnerGUID())
             {
                 if (Unit* owner = GetOwner())
@@ -550,6 +554,8 @@ void GameObject::Update(uint32 diff)
                 return;
             }
 
+            SetLootState(GO_READY);
+
             //burning flags in some battlegrounds, if you find better condition, just add it
             if (GetGOInfo()->IsDespawnAtAction() || GetGoAnimProgress() > 0)
             {
@@ -558,9 +564,6 @@ void GameObject::Update(uint32 diff)
                 SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
             }
 
-            loot.clear();
-            SetLootState(GO_READY);
-
             if (!m_respawnDelayTime)
                 return;