diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index bf65fba0..1e699e81 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -7245,7 +7245,13 @@ uint8_t Player::getLastMount() const { if (value > 0) { return value; } - return static_cast(kv()->get("last-mount")->get()); + + const auto lastMount = kv()->get("last-mount"); + if (!lastMount.has_value()) { + return 0; + } + + return static_cast(lastMount->get()); } uint8_t Player::getCurrentMount() const {