diff options
author | Shauren <shauren.trinity@gmail.com> | 2013-04-09 17:26:02 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2013-04-09 17:26:02 +0200 |
commit | 5de7bf1f177302180a12cc5898cdecc14b47f91e (patch) | |
tree | 91c21302496e530ae5fc643db84249c58be14f41 /src | |
parent | 4384f02352e0fc73d5ac7b958f323a779e5a4f0d (diff) |
Core/Objects
* Vehicles can now be sent with UPDATETYPE_CREATE_OBJECT2
* Corrected HIGHGUID type for guilds
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 9 | ||||
-rw-r--r-- | src/server/game/Entities/Object/ObjectDefines.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index f9140181b75..8cb14e657cb 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -200,14 +200,22 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c updateType = UPDATETYPE_CREATE_OBJECT2; break; case HIGHGUID_UNIT: + case HIGHGUID_VEHICLE: + { if (TempSummon const* summon = ToUnit()->ToTempSummon()) if (IS_PLAYER_GUID(summon->GetSummonerGUID())) updateType = UPDATETYPE_CREATE_OBJECT2; + break; + } case HIGHGUID_GAMEOBJECT: + { if (IS_PLAYER_GUID(ToGameObject()->GetOwnerGUID())) updateType = UPDATETYPE_CREATE_OBJECT2; break; + } + default: + break; } if (flags & UPDATEFLAG_STATIONARY_POSITION) @@ -236,7 +244,6 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c if (unit->getVictim()) flags |= UPDATEFLAG_HAS_TARGET; - ByteBuffer buf(500); buf << uint8(updateType); buf.append(GetPackGUID()); diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h index 846e4d71534..a779805f36b 100644 --- a/src/server/game/Entities/Object/ObjectDefines.h +++ b/src/server/game/Entities/Object/ObjectDefines.h @@ -36,7 +36,7 @@ enum HighGuid HIGHGUID_BATTLEGROUND = 0x1F1, // new 4.x HIGHGUID_MO_TRANSPORT = 0x1FC, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT) HIGHGUID_GROUP = 0x1F5, - HIGHGUID_GUILD = 0x1FF5 // new 4.x + HIGHGUID_GUILD = 0x1FF // new 4.x }; // used for creating values for respawn for example |