diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-06-15 15:23:08 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-06-15 15:23:08 +0200 |
| commit | 410bc499768ce2b5d1e5247815efebd0ba9b65a3 (patch) | |
| tree | 67292578bf7e519ee25d821409c9b4604a83f7d7 /src/server/game/Entities | |
| parent | f59e2ddd3112d0d3b666bd94d29b0cbb2d6e74f3 (diff) | |
Core: Updated to 7.2.5.24330
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index a96015a848a..8a722de45dc 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -447,7 +447,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const // *data << ObjectGuid(ID); // *data << Vector3(Origin); // *data << Vector3(Direction); - // *data << int32(TransportID); + // *data << uint32(TransportID); // *data << float(Magnitude); // data->WriteBits(Type, 2); //} @@ -503,8 +503,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const *data << uint64(ToGameObject()->GetPackedWorldRotation()); // Rotation if (GameObject const* go = ToGameObject()) - for (uint32 i = 0; i < PauseTimesCount; ++i) - *data << uint32(go->GetGOValue()->Transport.StopFrames->at(i)); + data->append(go->GetGOValue()->Transport.StopFrames->data(), PauseTimesCount); if (HasMovementTransport) { diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 152e4009c63..5310109570b 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -19,7 +19,7 @@ #ifndef _UPDATEFIELDS_H #define _UPDATEFIELDS_H -// Auto generated for version 7, 2, 0, 23801 +// Auto generated for version 7, 2, 5, 24236 enum ObjectFields { diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 22387bfc31b..3b8f89c76c2 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13851,7 +13851,7 @@ void Unit::SendThreatListUpdate() { WorldPackets::Combat::ThreatInfo info; info.UnitGUID = (*itr)->getUnitGuid(); - info.Threat = int32((*itr)->getThreat() * 100); + info.Threat = int64((*itr)->getThreat() * 100); packet.ThreatList.push_back(info); } SendMessageToSet(packet.Write(), false); @@ -13871,7 +13871,7 @@ void Unit::SendChangeCurrentVictimOpcode(HostileReference* pHostileReference) { WorldPackets::Combat::ThreatInfo info; info.UnitGUID = (*itr)->getUnitGuid(); - info.Threat = int32((*itr)->getThreat() * 100); + info.Threat = int64((*itr)->getThreat() * 100); packet.ThreatList.push_back(info); } SendMessageToSet(packet.Write(), false); |