Index: trunk/src/bindings/scripts/include/sc_creature.cpp
===================================================================
--- trunk/src/bindings/scripts/include/sc_creature.cpp (revision 6)
+++ trunk/src/bindings/scripts/include/sc_creature.cpp (revision 12)
@@ -6,5 +6,4 @@
 #include "Item.h"
 #include "Spell.h"
-#include "WorldPacket.h"
 
 // Spell summary for ScriptedAI::SelectSpell
@@ -203,8 +202,5 @@
     }
 
-    WorldPacket data(4);
-    data.SetOpcode(SMSG_PLAY_SOUND);
-    data << uint32(sound);
-    unit->SendMessageToSet(&data,false);
+    unit->SendPlaySound(sound, false);
 }
 
Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
===================================================================
--- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 6)
+++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 12)
@@ -584,12 +584,12 @@
                     switch (rand()%8)
                     {
-                        case 0: (*i)->PlaySound(RND_WISPER_1, true); break;
-                        case 1: (*i)->PlaySound(RND_WISPER_2, true); break;
-                        case 2: (*i)->PlaySound(RND_WISPER_3, true); break;
-                        case 3: (*i)->PlaySound(RND_WISPER_4, true); break;
-                        case 4: (*i)->PlaySound(RND_WISPER_5, true); break;
-                        case 5: (*i)->PlaySound(RND_WISPER_6, true); break;
-                        case 6: (*i)->PlaySound(RND_WISPER_7, true); break;
-                        case 7: (*i)->PlaySound(RND_WISPER_8, true); break;
+                        case 0: (*i)->SendPlaySound(RND_WISPER_1, true); break;
+                        case 1: (*i)->SendPlaySound(RND_WISPER_2, true); break;
+                        case 2: (*i)->SendPlaySound(RND_WISPER_3, true); break;
+                        case 3: (*i)->SendPlaySound(RND_WISPER_4, true); break;
+                        case 4: (*i)->SendPlaySound(RND_WISPER_5, true); break;
+                        case 5: (*i)->SendPlaySound(RND_WISPER_6, true); break;
+                        case 6: (*i)->SendPlaySound(RND_WISPER_7, true); break;
+                        case 7: (*i)->SendPlaySound(RND_WISPER_8, true); break;
                     }
                 }
Index: trunk/src/bindings/scripts/ScriptMgr.cpp
===================================================================
--- trunk/src/bindings/scripts/ScriptMgr.cpp (revision 6)
+++ trunk/src/bindings/scripts/ScriptMgr.cpp (revision 12)
@@ -1854,8 +1854,5 @@
         if(GetSoundEntriesStore()->LookupEntry((*i).second.SoundId))
         {
-            WorldPacket data(4);
-            data.SetOpcode(SMSG_PLAY_SOUND);
-            data << uint32((*i).second.SoundId);
-            pSource->SendMessageToSet(&data,false);
+            pSource->SendPlaySound((*i).second.SoundId, false);
         }
         else