aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Movement
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2017-02-13 21:05:32 +0100
committerShauren <shauren.trinity@gmail.com>2017-02-13 21:05:32 +0100
commitb3f04ec1570c7fd6ef0d1dacfb7ff9f8ab00a43d (patch)
treea6ed2772652e884ca9399ddf789d6bd035052bfd /src/server/game/Movement
parent2412886ef69d305df1bd6e6422ca3134c0ab1449 (diff)
Added some missing SetFallInformation calls (#19121)
Fixed HP drop bug on zeppelins Fixed possible packet relocation problems on huge transports
Diffstat (limited to 'src/server/game/Movement')
-rw-r--r--src/server/game/Movement/MotionMaster.cpp3
-rwxr-xr-xsrc/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index ea3583b0cdf..8911278ed93 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -585,7 +585,10 @@ void MotionMaster::MoveFall(uint32 id /*=0*/)
// don't run spline movement for players
if (_owner->GetTypeId() == TYPEID_PLAYER)
+ {
+ _owner->ToPlayer()->SetFallInformation(0, _owner->GetPositionZ());
return;
+ }
Movement::MoveSplineInit init(_owner);
init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz, false);
diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
index 2644b670de7..067a383fb33 100755
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -328,6 +328,7 @@ void FlightPathMovementGenerator::DoFinalize(Player* player)
// this prevent cheating with landing point at lags
// when client side flight end early in comparison server side
player->StopMoving();
+ player->SetFallInformation(0, player->GetPositionZ());
}
player->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_TAXI_BENCHMARK);