Small bug fixes#1046
Merged
Merged
Conversation
Mining stardust while holding the max (>=200) returned -1 from addOre, which short-circuited deplete() in the mining loop. handleMinedStarDust never ran, so the shared totalCollected counter grew unbounded while the star never advanced a layer - causing an infinite star and a negative '% left of this layer' prospect message. Count the maxed swing as a successful mine (returns 1) so the star depletes normally and experience is awarded. Also clamp the layer percentage to >=0 as a guard. Fixes GregHib#1043
Regression test for the infinite shooting star (GregHib#1043): a player holding 200 stardust mining a crashed star one layer-collection away from advancing must push it to the next tier. Fails against the old return -1 path (star never depletes, hits the tick limit).
The customs officer (npc 380) spawns at both Musa Point and Brimhaven docks but the shared script always sent players to Port Sarim. The Brimhaven officer now routes to Ardougne docks via the brimhaven_to_ardougne journey, branching on the officer's location. Adds the Brimhaven and Ardougne dock gangplank objects/teleports (2085-2088) so players can board and disembark the legacy ship. Closes GregHib#1045
Matches the canonical journey delay for varp value 8 (~3s). The ship's stop position on the journey map is defined by the client cache for that varp value, not by server data, so the delay only controls how long the cutscene runs before teleporting.
- Captain Barnaby Talk-to/Pay-fare dialogue sails Ardougne -> Brimhaven (varp value 7). Repoints the dock spawn to captain_barnaby_2 (4974), the interactive variant; the previously-spawned captain_barnaby_1 (4961) has no Talk-to option. - Boarding either docked ship via the gangplank shows a hint to speak to the operator first (via objTeleportLand, so the teleport still runs). - Ship's ladder (9745) Climb-down gives the standard refusal message. Mirrors the Ardougne<->Brimhaven charter from 2011Scape/game#610.
The remaining captain_barnaby spawn (id 381) has no Talk-to/Pay-fare option; only captain_barnaby_2 (id 4974) is the charter operator.
This reverts commit f61a6f525d5487743f139ce74dd5c85a5916adfe.
GregHib
approved these changes
Jun 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bug fixes
Tests