2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-02 16:49:03 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

[PR #501] [MERGED] Update how player shop is handled #14141

New Issue
Open
opened 2026-06-07 12:23:11 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-06-07 12:23:11 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/501
Author: @RedSparr0w
Created: 9/20/2021
Status: ✅ Merged
Merged: 9/20/2021
Merged by: @Dark98

Base: master ← Head: player-shop

📝 Commits (7)

  • 0d776a8 Update how player shop is handled
  • d27d3c3 Squashed commit of the following:
  • 87c4e36 Update DialogueHandler.java
  • 03d0528 Fix for models out of bounds
  • 88c428e Revert "Squashed commit of the following:"
  • 7a15a05 Merge remote-tracking branch 'upstream/master' into player-shop
  • 7c18632 Other shop tidy up

📊 Changes

9 files changed (+75 additions, -20 deletions)

View changed files

📝 2006Scape Client/src/main/java/Model.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java (+1 -1)
📝 2006Scape Server/src/main/java/com/rs2/game/bots/BotHandler.java (+10 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java (+11 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java (+18 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/players/Player.java (+4 -0)
📝 2006Scape Server/src/main/java/com/rs2/game/shops/ShopAssistant.java (+3 -3)
📝 2006Scape Server/src/main/java/com/rs2/game/shops/ShopHandler.java (+23 -11)
📝 2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java (+4 -4)

📄 Description

Update player shops

New menu for ::shop command:
image
image

Player shops now show as combat level 0
image

Also fixed when someone else buys items from a shop, should now reload amounts on all players clients.
(all shops, not just player shops)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/2006-Scape/2006Scape/pull/501 **Author:** [@RedSparr0w](https://github.com/RedSparr0w) **Created:** 9/20/2021 **Status:** ✅ Merged **Merged:** 9/20/2021 **Merged by:** [@Dark98](https://github.com/Dark98) **Base:** `master` ← **Head:** `player-shop` --- ### 📝 Commits (7) - [`0d776a8`](https://github.com/2006-Scape/2006Scape/commit/0d776a82b9d14d2d887a662ab14afaf77484a966) Update how player shop is handled - [`d27d3c3`](https://github.com/2006-Scape/2006Scape/commit/d27d3c357cb6be6bf1c882fded1c1e3734a6b92c) Squashed commit of the following: - [`87c4e36`](https://github.com/2006-Scape/2006Scape/commit/87c4e36cb3984e91e04db80cfd68cfffb43b4d30) Update DialogueHandler.java - [`03d0528`](https://github.com/2006-Scape/2006Scape/commit/03d05286f6a84588228a0049ec21c4c9bc6ce4b5) Fix for models out of bounds - [`88c428e`](https://github.com/2006-Scape/2006Scape/commit/88c428eacb00634e5abe52d59f0e334efaa057e2) Revert "Squashed commit of the following:" - [`7a15a05`](https://github.com/2006-Scape/2006Scape/commit/7a15a05b26234d15ffead7fd81dba49c95d6dc31) Merge remote-tracking branch 'upstream/master' into player-shop - [`7c18632`](https://github.com/2006-Scape/2006Scape/commit/7c1863295d1f1a0ee763267729c97ab21bd8773f) Other shop tidy up ### 📊 Changes **9 files changed** (+75 additions, -20 deletions) <details> <summary>View changed files</summary> 📝 `2006Scape Client/src/main/java/Model.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/bots/Bot.java` (+1 -1) 📝 `2006Scape Server/src/main/java/com/rs2/game/bots/BotHandler.java` (+10 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java` (+11 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java` (+18 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/players/Player.java` (+4 -0) 📝 `2006Scape Server/src/main/java/com/rs2/game/shops/ShopAssistant.java` (+3 -3) 📝 `2006Scape Server/src/main/java/com/rs2/game/shops/ShopHandler.java` (+23 -11) 📝 `2006Scape Server/src/main/java/com/rs2/net/packets/impl/Commands.java` (+4 -4) </details> ### 📄 Description Update player shops New menu for `::shop` command: ![image](https://user-images.githubusercontent.com/7288322/133966376-b8e206b1-47c8-4d25-b8f9-8545bc27b46f.png) ![image](https://user-images.githubusercontent.com/7288322/133966437-65e6c71b-c64b-403f-bd3e-81f6b6c44de8.png) Player shops now show as combat level 0 ![image](https://user-images.githubusercontent.com/7288322/133967335-61647fb3-994a-4b4c-8306-3c36c58aaf99.png) Also fixed when someone else buys items from a shop, should now reload amounts on all players clients. _(all shops, not just player shops)_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Dark98 added the pull-request label 2026-06-07 12:23:11 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Cannot Reproduce
Difficulty: Easy
Difficulty: Easy
Difficulty: Hard
Difficulty: Medium
Documentation
enhancement
Highest Priority of Type
New Content
New Content
pull-request
Mirrored from GitHub Pull Request
 QoL
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Dark98
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#14141
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?