aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2018-05-05 18:53:59 +0200
committerccrs <ccrs@users.noreply.github.com>2018-05-05 18:53:59 +0200
commit76667e45a902f86bd341d40efa28037137e5e541 (patch)
tree7c0ae0428afe64fd936c4f55de76216c8b960c56
parent623bc6483a067accf816a65c693b0c0df6a999c3 (diff)
Core/Movement: crashfix workaround
untested ref #18471
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 2f8f2b26726..7c78ca3f649 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13040,7 +13040,9 @@ void Unit::SetFacingTo(float ori, bool force)
if (HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && GetTransGUID())
init.DisableTransportPathTransformations(); // It makes no sense to target global orientation
init.SetFacing(ori);
- GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_FACE, MOTION_SLOT_CONTROLLED);
+
+ //GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_FACE, MOTION_SLOT_CONTROLLED);
+ init.Launch();
}
void Unit::SetFacingToObject(WorldObject const* object, bool force)
@@ -13053,7 +13055,9 @@ void Unit::SetFacingToObject(WorldObject const* object, bool force)
Movement::MoveSplineInit init(this);
init.MoveTo(GetPositionX(), GetPositionY(), GetPositionZ(), false);
init.SetFacing(GetAbsoluteAngle(object)); // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming
- GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_FACE, MOTION_SLOT_CONTROLLED);
+
+ //GetMotionMaster()->LaunchMoveSpline(std::move(init), EVENT_FACE, MOTION_SLOT_CONTROLLED);
+ init.Launch();
}
bool Unit::SetWalk(bool enable)