Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Misc: Partialy fix one AnimKit crash

Browse Source 
By Krudor
It still crashes at close client
updates #112
If anyone have idea i have one sniff comparing the values on retail 4.3.4, without this fix, without animkit and with this fix with animkit.

Join https://t.me/joinchat/AAAAAAiEtwpxLaE8MnmdeA
This commit is contained in:
Aokromes committed 2017-02-18 04:40:17 +01:00
1 parent ca20d34f59
commit 471918fd47
1 file changed
+16 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Object.cpp
+16 -10
View File
@@ -352,6 +352,9 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
bool hasPitch = false;
bool hasSpline = false;
bool hasSplineElevation = false;
bool hasAIAnimKit = false;
bool hasMovementAnimKit = false;
bool hasMeleeAnimKit = false;
uint32 stopFrameCount = 0;
if (GameObject const* go = ToGameObject())
@@ -474,9 +477,12 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
if (flags & UPDATEFLAG_ANIMKITS)
{
WorldObject const* self = static_cast<WorldObject const*>(this);
*data << uint16(self->GetAIAnimKitId()); // AiID
*data << uint16(self->GetMovementAnimKitId()); // MovementID
*data << uint16(self->GetMeleeAnimKitId()); // MeleeID
hasAIAnimKit = self->GetAIAnimKitId();
data->WriteBit(hasAIAnimKit);
hasMovementAnimKit = self->GetMovementAnimKitId();
data->WriteBit(hasMovementAnimKit);
hasMeleeAnimKit = self->GetMeleeAnimKitId();
data->WriteBit(hasMeleeAnimKit);
}
data->FlushBits();
@@ -647,13 +653,13 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const
if (flags & UPDATEFLAG_ANIMKITS)
{
Unit const* unit = ToUnit();
if (unit->GetAIAnimKitId())
*data << uint16(unit->GetAIAnimKitId());
if (unit->GetMovementAnimKitId())
*data << uint16(unit->GetMovementAnimKitId());
if (unit->GetMeleeAnimKitId())
*data << uint16(unit->GetMeleeAnimKitId());
WorldObject const* self = static_cast<WorldObject const*>(this);
if (hasAIAnimKit)
*data << uint16(self->GetAIAnimKitId());
if (hasMovementAnimKit)
*data << uint16(self->GetMovementAnimKitId());
if (hasMeleeAnimKit)
*data << uint16(self->GetMeleeAnimKitId());
}
if (flags & UPDATEFLAG_TRANSPORT)