Skip to content

fix(Core/Vehicle): no longer eject and overwrite an existing passenger#25591

Draft
sogladev wants to merge 1 commit intoazerothcore:masterfrom
sogladev:fix-vehicle-eject
Draft

fix(Core/Vehicle): no longer eject and overwrite an existing passenger#25591
sogladev wants to merge 1 commit intoazerothcore:masterfrom
sogladev:fix-vehicle-eject

Conversation

@sogladev
Copy link
Copy Markdown
Member

Changes Proposed:

This PR proposes changes to:

  • Core (units, players, creatures, game systems).
  • Scripts (bosses, spell scripts, creature scripts).
  • Database (SAI, creatures, etc).

followup on:

TODO: Using the harpoon can overwrite / mount an already occupied player's seat.

Current vehicle logic allows a player to board a vehicle by ejecting an existing passenger. It's more sensible to eject a passenger before overwriting their seat.

Unsure which core logic or scripts rely on this force-eject behavior.

AI-assisted Pull Requests

Important

While the use of AI tools when preparing pull requests is not prohibited, contributors must clearly disclose when such tools have been used and specify the model involved.

Contributors are also expected to fully understand the changes they are submitting and must be able to explain and justify those changes when requested by maintainers.

  • AI tools (e.g. ChatGPT, Claude, or similar) were used entirely or partially in preparing this pull request. Please specify which tools were used, if any.

GPT-5.4 to triage

Issues Addressed:

  • Closes

SOURCE:

The changes have been validated through:

  • Live research (checked on live servers, e.g Classic WotLK, Retail, etc.)
  • Sniffs (remember to share them with the open source community!)
  • Video evidence, knowledge databases or other public sources (e.g forums, Wowhead, etc.)
  • The changes promoted by this pull request come partially or entirely from another project (cherry-pick). Cherry-picks must be committed using the proper --author tag in order to be accepted, thus crediting the original authors, unless otherwise unable to be found

Tests Performed:

This PR has been:

  • Tested in-game by the author.
  • Tested in-game by other community members/someone else other than the author/has been live on production servers.
  • This pull request requires further testing and may have edge cases to be tested.

How to Test the Changes:

  • This pull request can be tested by following the reproduction steps provided in the linked issue
  • This pull request requires further testing. Provide steps to test your changes. If it requires any specific setup e.g multiple players please specify it as well.

Known Issues and TODO List:

  • [ ]
  • [ ]

How to Test AzerothCore PRs

When a PR is ready to be tested, it will be marked as [WAITING TO BE TESTED].

You can help by testing PRs and writing your feedback here on the PR's page on GitHub. Follow the instructions here:

http://www.azerothcore.org/wiki/How-to-test-a-PR

REMEMBER: when testing a PR that changes something generic (i.e. a part of code that handles more than one specific thing), the tester should not only check that the PR does its job (e.g. fixing spell XXX) but especially check that the PR does not cause any regression (i.e. introducing new bugs).

For example: if a PR fixes spell X by changing a part of code that handles spells X, Y, and Z, we should not only test X, but we should test Y and Z as well.

@sogladev sogladev added WIP Work in Progress. Ready to be Reviewed labels Apr 25, 2026
Copilot AI review requested due to automatic review settings April 25, 2026 15:27
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Adjusts vehicle boarding logic to avoid forcibly ejecting an existing passenger when attempting to add a new passenger to an occupied seat.

Changes:

  • When the requested seat is occupied, search for the next empty seat instead of ejecting the current occupant.
  • If no empty seat exists (or the computed seat cannot be found), fail the add operation.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

int8 nextSeatId = GetNextEmptySeat(seatId, true);
if (nextSeatId == -1)
return false;

Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code switches the seat iterator to nextSeatId, but does not update seatId. If later logic in AddPassenger uses the seatId parameter (e.g., for packets, bookkeeping, or aura/vehicle state), this can desync the selected seat from the recorded seat id. Fix by updating seatId = nextSeatId; (or consistently using seat->first from this point onward) so the chosen seat id and iterator remain aligned.

Suggested change
seatId = nextSeatId;

Copilot uses AI. Check for mistakes.
Comment on lines +361 to +362
if (nextSeatId == -1)
return false;
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using a raw -1 sentinel for an invalid seat id makes the intent harder to read and duplicates knowledge about GetNextEmptySeat’s contract. Prefer a named constant (e.g., INVALID_SEAT_ID) or an std::optional<int8>-style pattern (if feasible in this codebase) to make the failure condition self-documenting.

Copilot uses AI. Check for mistakes.
Comment on lines +360 to +362
int8 nextSeatId = GetNextEmptySeat(seatId, true);
if (nextSeatId == -1)
return false;
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR description says it's more sensible to eject a passenger before overwriting their seat, which implies preserving a force-eject flow but fixing ordering. The code change instead removes ejection entirely and fails when no empty seats remain. Please update the PR description to match the implemented behavior (or adjust the implementation if the intended behavior is still to allow boarding by ejecting under some conditions).

Copilot uses AI. Check for mistakes.
@github-actions github-actions Bot added CORE Related to the core file-cpp Used to trigger the matrix build labels Apr 25, 2026
@sogladev sogladev marked this pull request as draft April 25, 2026 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CORE Related to the core file-cpp Used to trigger the matrix build WIP Work in Progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants