*Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 7 deletions

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 9d5f7eb8f57..f94ee52efdb 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -126,13 +126,12 @@ void Object::_Create( uint32 guidlow, uint32 entry, HighGuid guidhigh )
     m_PackGUID.appendPackGUID(GetGUID());
 }
 
-// This function is never used
 void Object::BuildMovementUpdateBlock(UpdateData * data, uint32 flags ) const
 {
-    ByteBuffer buf(500);
+    ByteBuffer buf(50);
 
     buf << uint8( UPDATETYPE_MOVEMENT );
-    buf << (uint8)0xFF << GetGUID();
+    buf.append(GetPackGUID());
 
     _BuildMovementUpdate(&buf, flags);
 
@@ -189,9 +188,9 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) c
 
     //sLog.outDebug("BuildCreateUpdate: update-type: %u, object-type: %u got flags: %X, flags2: %X", updatetype, m_objectTypeId, flags, flags2);
 
-    ByteBuffer buf(500);
+    ByteBuffer buf(50);
     buf << (uint8)updatetype;
-    buf << (uint8)0xFF << GetGUID();
+    buf.append(GetPackGUID());
     buf << (uint8)m_objectTypeId;
 
     _BuildMovementUpdate(&buf, flags);
@@ -225,10 +224,10 @@ void Object::SendUpdateToPlayer(Player* player)
 
 void Object::BuildValuesUpdateBlockForPlayer(UpdateData *data, Player *target) const
 {
-    ByteBuffer buf(500);
+    ByteBuffer buf(50);
 
     buf << (uint8) UPDATETYPE_VALUES;
-    buf << (uint8)0xFF << GetGUID();
+    buf.append(GetPackGUID());
 
     UpdateMask updateMask;
     updateMask.SetCount( m_valuesCount );