josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/PacketIO: Fixed creature teleports not working clientside

Browse Source
This commit is contained in:
Shauren
2015-09-23 00:05:18 +02:00
parent a338aa408e
commit 91f2bef235
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+1 -7
View File
@@ -1927,13 +1927,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
SetSemaphoreTeleportNear(true);
// near teleport, triggering send CMSG_MOVE_TELEPORT_ACK from client at landing
if (!GetSession()->PlayerLogout())
{
Position oldPos = GetPosition();
if (HasUnitMovementFlag(MOVEMENTFLAG_HOVER))
z += GetFloatValue(UNIT_FIELD_HOVERHEIGHT);
Relocate(x, y, z, orientation);
SendTeleportPacket(oldPos); // this automatically relocates to oldPos in order to broadcast the packet in the right place
}
SendTeleportPacket(m_teleport_dest);
}
else
{
src/server/game/Entities/Unit/Unit.cpp
+19 -29
View File
@@ -15434,42 +15434,32 @@ void Unit::NearTeleportTo(float x, float y, float z, float orientation, bool cas
void Unit::SendTeleportPacket(Position& pos)
{
// SMSG_MOVE_UPDATE_TELEPORT is sent to nearby players to signal the teleport
// MSG_MOVE_TELEPORT is sent to self in order to trigger MSG_MOVE_TELEPORT_ACK and update the position server side
// SMSG_MOVE_TELEPORT is sent to self in order to trigger CMSG_MOVE_TELEPORT_ACK and update the position server side
// This oldPos actually contains the destination position if the Unit is a Player.
Position oldPos = {GetPositionX(), GetPositionY(), GetPositionZMinusOffset(), GetOrientation()};
if (GetTypeId() == TYPEID_UNIT)
Relocate(&pos); // Relocate the unit to its new position in order to build the packets correctly.
WorldPackets::Movement::MoveUpdateTeleport packet;
packet.movementInfo = &m_movementInfo;
WorldPackets::Movement::MoveUpdateTeleport moveUpdateTeleport;
moveUpdateTeleport.movementInfo = &m_movementInfo;
if (GetTypeId() == TYPEID_PLAYER)
{
WorldPackets::Movement::MoveTeleport selfPacket;
selfPacket.MoverGUID = GetGUID();
ObjectGuid transGuid = GetTransGUID();
if (!transGuid.IsEmpty())
selfPacket.TransportGUID = transGuid;
selfPacket.Pos.Relocate(GetPositionX(), GetPositionY(), GetPositionZMinusOffset());
selfPacket.Facing = GetOrientation();
selfPacket.SequenceIndex = m_movementCounter++;
ToPlayer()->SendDirectMessage(selfPacket.Write());
WorldPackets::Movement::MoveTeleport moveTeleport;
moveTeleport.MoverGUID = GetGUID();
moveTeleport.TransportGUID = GetTransGUID();
moveTeleport.Pos.Relocate(pos);
moveTeleport.Facing = GetOrientation();
moveTeleport.SequenceIndex = m_movementCounter++;
ToPlayer()->SendDirectMessage(moveTeleport.Write());
}
else
{
// This is the only packet sent for creatures which contains MovementInfo structure
// we do not update m_movementInfo for creatures so it needs to be done manually here
moveUpdateTeleport.movementInfo->guid = GetGUID();
moveUpdateTeleport.movementInfo->pos.Relocate(pos);
moveUpdateTeleport.movementInfo->time = getMSTime();
}
// Relocate the player/creature to its old position, so we can broadcast to nearby players correctly
if (GetTypeId() == TYPEID_PLAYER)
Relocate(&pos);
else
Relocate(&oldPos);
// Broadcast the packet to everyone except self.
SendMessageToSet(packet.Write(), false);
SendMessageToSet(moveUpdateTeleport.Write(), false);
}
bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool teleport)