*Merge.

--HG--
branch : trunk

1 files changed, 2 insertions, 4 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index abac18f7a79..0eab6a025fa 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -2930,6 +2930,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
                         return;
 
                 Script->GOHello(player, gameObjTarget);
+                sWorld.ScriptsStart(sGameObjectScripts, gameObjTarget->GetDBTableGUIDLow(), player, gameObjTarget);
+
                 gameObjTarget->AddUniqueUse(player);
                 gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
 
@@ -2943,10 +2945,6 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
                 if(uint32 trapEntry = gameObjTarget->GetGOInfo()->goober.linkedTrapId)
                     gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
 
-                // activate GO scripts
-                Script->GOHello(player, gameObjTarget);
-                sWorld.ScriptsStart(sGameObjectScripts, gameObjTarget->GetDBTableGUIDLow(), player, gameObjTarget);
-
                 return;
 
             case GAMEOBJECT_TYPE_CHEST: