Skip to content

fix: NPC_PutInVehicle not visually attaching NPC to boat seat #1236

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
Revelts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: NPC_PutInVehicle not visually attaching NPC to boat seat #1236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions Server/Components/NPCs/NPC/npc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,18 @@ bool NPC::putInVehicle(IVehicle& vehicle, uint8_t seat)
vehicle_ = &vehicle;
vehicleSeat_ = seat;

// Vehicle::putPlayer only sends PutPlayerInVehicle to the entering player,
// which is a no-op for an NPC (no real client to receive it). Without an
// explicit broadcast, remote clients have no signal to visually attach the
// NPC and must rely on the next DriverSync, which some vehicles (notably
// boats) refuse to honour while the player is on-foot. Mirror the natural
// goToVehicle flow by broadcasting EnterVehicle to streamed players.
NetCode::RPC::EnterVehicle enterVehicleRPC;
enterVehicleRPC.PlayerID = player_->getID();
enterVehicleRPC.VehicleID = vehicle.getID();
enterVehicleRPC.Passenger = (seat != 0) ? 1 : 0;
PacketHelper::broadcastToStreamed(enterVehicleRPC, *player_, true);

auto angle = vehicle.getRotation().ToEuler().z;
auto rotation = getRotation().ToEuler();
rotation.z = angle;
Expand Down