Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Entities: Fixed transport data in update object for non-units

Browse Source
This commit is contained in:
Shauren
2014-11-02 18:53:15 +01:00
parent 4f7bd78b56
commit 2b0d411250
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Object/Object.cpp
View File

@@ -211,6 +211,11 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c
break;
}
if (!(flags & UPDATEFLAG_LIVING))
if (WorldObject const* worldObject = dynamic_cast<WorldObject const*>(this))
if (!worldObject->m_movementInfo.transport.guid.IsEmpty())
flags |= UPDATEFLAG_TRANSPORT_POSITION;
if (flags & UPDATEFLAG_STATIONARY_POSITION)
{
// UPDATETYPE_CREATE_OBJECT2 for some gameobject types...
@@ -355,7 +360,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const
bool PlayHoverAnim = false;
bool IsSuppressingGreetings = false;
bool HasMovementUpdate = flags & UPDATEFLAG_LIVING;
bool HasMovementTransport = flags & UPDATEFLAG_GO_TRANSPORT_POSITION;
bool HasMovementTransport = flags & UPDATEFLAG_TRANSPORT_POSITION;
bool Stationary = flags & UPDATEFLAG_STATIONARY_POSITION;
bool CombatVictim = flags & UPDATEFLAG_HAS_TARGET;
bool ServerTime = flags & UPDATEFLAG_TRANSPORT;

2
src/server/game/Entities/Object/Updates/UpdateData.h
View File

@@ -42,7 +42,7 @@ enum OBJECT_UPDATE_FLAGS
UPDATEFLAG_LIVING = 0x0008,
UPDATEFLAG_STATIONARY_POSITION = 0x0010,
UPDATEFLAG_VEHICLE = 0x0020,
UPDATEFLAG_GO_TRANSPORT_POSITION = 0x0040,
UPDATEFLAG_TRANSPORT_POSITION = 0x0040,
UPDATEFLAG_ROTATION = 0x0080,
UPDATEFLAG_ANIMKITS = 0x0100,
//UPDATEFLAG_AREATRIGGER = 0x0200,