aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2017-05-03 14:14:37 +0200
committerccrs <ccrs@users.noreply.github.com>2017-05-03 14:14:37 +0200
commitd92132f1dcc097daca20804880f7d4874b86e59b (patch)
tree71e22b948b961cb0057909e32228414d26ab8124 /src
parent4d2a64cdf204258e5393b0ae8bede96791f8ea0e (diff)
Core/Unit: 6fe4d37f8d followup
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index d1bda821fc0..9b0747a6cd6 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -1933,9 +1933,9 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
if (HasUnitMovementFlag(MOVEMENTFLAG_HOVER))
newPosition.m_positionZ += GetFloatValue(UNIT_FIELD_HOVERHEIGHT);
- UpdatePosition(newPosition, true);
SendTeleportAckPacket();
SendTeleportPacket();
+ UpdatePosition(newPosition, true);
UpdateObjectVisibility();
}
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e710708faae..0b817a59c54 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13809,8 +13809,8 @@ void Unit::NearTeleportTo(Position const& pos, bool casting /*= false*/)
}
else
{
- UpdatePosition(pos, true);
SendTeleportPacket();
+ UpdatePosition(pos, true);
UpdateObjectVisibility();
}
}