Skip to content

Fix vehicle teleport bug and revert issue 735 #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix vehicle teleport bug and revert issue 735 #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d194bd
Update player_impl.hpp
dimmyi Mar 9, 2024
4ddc3d7
Reversing issue 735
dimmyi Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions Server/Components/Vehicles/vehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,16 +809,7 @@ void Vehicle::destream()
{
vehicleData->setVehicle(nullptr, 0);
}

// Related issue: https://github.com/openmultiplayer/open.mp/issues/735
// Disable spectator's spectating state when spectated vehicle is removed
// This also makes spectateData values to be accurate and not remain with old data
auto spectateData = player->getSpectateData();
if (spectateData.type == PlayerSpectateData::ESpectateType::Vehicle && spectateData.spectateID == poolID)
{
player->setSpectating(false);
}


if (isStreamedInForPlayer(*player))
{
streamOutForClient(*player);
Expand Down
7 changes: 7 additions & 0 deletions Server/Source/player_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,6 +1672,13 @@ struct Player final : public IPlayer, public PoolIDProvider, public NoCopy
pos_ = target.getPosition();
target.streamInForPlayer(*this);

IPlayer* vdriver = target.getDriver();
// Stream vehicle driver immediately.
if (vdriver != nullptr)
{
vdriver->streamInForPlayer(*this);
}

spectateData_.type = PlayerSpectateData::ESpectateType::Vehicle;
spectateData_.spectateID = target.getID();

Expand Down