Core/Movement: enable packetOnly parameter for SetCanFly

This commit is contained in:
Ovahlord committed 2018-11-16 10:50:24 +01:00
1 parent 06448306c3
commit e33f22ac7d
2 files changed
+23 -20

No files matched your search

+20 -20
View File
@@ -12841,7 +12841,7 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
SendMoveKnockBack(player, speedXY, -speedZ, vcos, vsin);
if (player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) || player->HasAuraType(SPELL_AURA_FLY))
player->SetCanFly(true, true);
player->SetCanFly(true, false);
}
}
@@ -14334,28 +14334,28 @@ bool Unit::SetSwim(bool enable)
return true;
}
bool Unit::SetCanFly(bool enable, bool /*packetOnly = false */)
bool Unit::SetCanFly(bool enable, bool packetOnly)
{
if (enable == HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY))
return false;
if (enable)
if (!packetOnly)
{
AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY);
RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION);
AddExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS);
SetFall(false);
}
else
{
RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY);
RemoveExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS);
if (!IsLevitating())
SetFall(true);
}
if (enable == HasUnitMovementFlag(MOVEMENTFLAG_CAN_FLY))
return false;
if (GetTypeId() == TYPEID_PLAYER)
ToPlayer()->SendMovementSetCanTransitionBetweenSwimAndFly(enable);
if (enable)
{
AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY);
RemoveUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_SPLINE_ELEVATION);
AddExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS);
SetFall(false);
}
else
{
RemoveUnitMovementFlag(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_MASK_MOVING_FLY);
RemoveExtraUnitMovementFlag(MOVEMENTFLAG2_CAN_SWIM_TO_FLY_TRANS);
if (!IsLevitating())
SetFall(true);
}
}
if (enable)
Movement::PacketSender(this, SMSG_SPLINE_MOVE_SET_FLYING, SMSG_MOVE_SET_CAN_FLY).Send();