From 8312130d34eebd6204c8879c4de4d07a5b078694 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 18 Jun 2022 22:06:44 +0200 Subject: [PATCH] Core/Transports: corrected a few more mistakes when reverting and porting transport changes --- src/server/game/Entities/Object/Object.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 62162037bf6..9c2cad025d3 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -363,7 +363,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint32 flags) const data->WriteBit(flags & UPDATEFLAG_SELF); data->WriteBit(flags & UPDATEFLAG_VEHICLE); data->WriteBit(flags & UPDATEFLAG_LIVING); - data->WriteBits(PauseTimes->size(), 24); + data->WriteBits(PauseTimes ? PauseTimes->size() : 0, 24); data->WriteBit(flags & UPDATEFLAG_NO_BIRTH_ANIM); data->WriteBit(flags & UPDATEFLAG_GO_TRANSPORT_POSITION); data->WriteBit(flags & UPDATEFLAG_STATIONARY_POSITION); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index df634d355f0..a2aba66662e 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1516,6 +1516,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati // code for finish transfer called in WorldSession::HandleMovementOpcodes() // at client packet CMSG_MOVE_TELEPORT_ACK + SetSemaphoreTeleportNear(true); // near teleport, triggering send CMSG_MOVE_TELEPORT_ACK from client at landing if (!GetSession()->PlayerLogout()) {