diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 294872f1e..a6e333f64 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1935,6 +1935,7 @@ void Map::PlayDirectSoundToMap(uint32 soundId, uint32 zoneId /*=0*/)
 {
     WorldPacket data(SMSG_PLAY_SOUND, 4);
     data << uint32(soundId);
+    data << ObjectGuid();
 
     Map::PlayerList const& pList = GetPlayers();
     for (PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 1a0a3c603..fc5d2c856 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1956,6 +1956,7 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/)
 {
     WorldPacket data(SMSG_PLAY_SOUND, 4);
     data << uint32(sound_id);
+    data << ObjectGuid();
     if (target)
         target->SendDirectMessage(&data);
     else
diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index 5eea36df5..de79116d1 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -769,7 +769,7 @@ void InitializeOpcodes()
     //OPCODE(UMSG_DELETE_GUILD_CHARTER,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(MSG_PETITION_RENAME,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetitionRenameOpcode      );
     OPCODE(SMSG_INIT_WORLD_STATES,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(SMSG_UPDATE_WORLD_STATE,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(SMSG_UPDATE_WORLD_STATE,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_PET_ACTION_FEEDBACK,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(CMSG_CHAR_RENAME,                             STATUS_AUTHED,   PROCESS_THREADUNSAFE, &WorldSession::HandleCharRenameOpcode          );
     OPCODE(SMSG_CHAR_RENAME,                             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index e210e7bee..330e35e76 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -754,7 +754,7 @@ enum Opcodes
     UMSG_DELETE_GUILD_CHARTER                             = 0x12C1,
     MSG_PETITION_RENAME                                   = 0x12C2,
     SMSG_INIT_WORLD_STATES                                = 0x4C15, // 4.3.4 15595
-    SMSG_UPDATE_WORLD_STATE                               = 0x12C4,
+    SMSG_UPDATE_WORLD_STATE                               = 0x4816, // 4.3.4 15595
     SMSG_PET_ACTION_FEEDBACK                              = 0x12C7,
     CMSG_CHAR_RENAME                                      = 0x2327, // 4.3.4 15595
     SMSG_CHAR_RENAME                                      = 0x2024, // 4.3.4 15595
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 9d04c59a9..ffd22457a 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -8390,9 +8390,10 @@ void Player::SendNotifyLootItemRemoved(uint8 lootSlot)
 
 void Player::SendUpdateWorldState(uint32 Field, uint32 Value)
 {
-    WorldPacket data(SMSG_UPDATE_WORLD_STATE, 8);
+    WorldPacket data(SMSG_UPDATE_WORLD_STATE, 8 + 1);
     data << Field;
     data << Value;
+    data << uint8(0);
     GetSession()->SendPacket(&data);
 }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 9a33e59dd..56c451923 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12171"
+ #define REVISION_NR "12172"
 #endif // __REVISION_NR_H__