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 #231] [MERGED] Some fixes #7337

New Issue
Closed
opened 2026-05-30 12:21:34 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-30 12:21:34 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/231
Author: @mrextremez
Created: 12/4/2019
Status: ✅ Merged
Merged: 12/5/2019
Merged by: @dginovker

Base: master ← Head: fixup

📝 Commits (8)

  • fc70f83 Some fixes
  • 4b49ce1 refactor pickpocketing slightly
  • 8c07f6b more refactoring, actual random
  • 765be40 refactor, each stall has it's own respawn timer
  • 8200eb0 refactor argument names
  • ae90b45 Merge remote-tracking branch 'mrextremez/fixup' into refactor
  • aad40c2 Update Stalls.java
  • f55fbba Merge pull request #1 from RedSparr0w/refactor

📊 Changes

11 files changed (+216 additions, -166 deletions)

View changed files

📝 2006Redone Server/data/cfg/shops.cfg (+1 -2)
📝 2006Redone Server/data/doorsbackup.txt (+0 -1)
📝 2006Redone Server/data/logs/commands/andrew5.txt (+1 -0)
📝 2006Redone Server/src/com/rebotted/GameConstants.java (+2 -1)
📝 2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicTeleports.java (+2 -2)
📝 2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java (+2 -2)
📝 2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java (+123 -79)
📝 2006Redone Server/src/com/rebotted/game/content/skills/thieving/Stalls.java (+78 -69)
📝 2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java (+0 -3)
📝 2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java (+6 -7)
📝 2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java (+1 -0)

📄 Description

  • Changed lumbridge teleport to require 31 magic instead of 32
  • Added back gaining items from thieving stalls
  • Fixed dialgoue issue after leveling up skill (such as smithing)
  • Made god capes untradable
  • Removed cannon balls from shop (they werent supposed to be in there)

closes #230
closes #228
closes #225

🔄 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/231 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 12/4/2019 **Status:** ✅ Merged **Merged:** 12/5/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `fixup` --- ### 📝 Commits (8) - [`fc70f83`](https://github.com/2006-Scape/2006Scape/commit/fc70f831f4428f2f95ce0253d9462905d28395e8) Some fixes - [`4b49ce1`](https://github.com/2006-Scape/2006Scape/commit/4b49ce115a126feacfbbbaebde1899c928e7eb7b) refactor pickpocketing slightly - [`8c07f6b`](https://github.com/2006-Scape/2006Scape/commit/8c07f6bea0fab68aea307f2532aa00c93c204ed9) more refactoring, actual random - [`765be40`](https://github.com/2006-Scape/2006Scape/commit/765be40238e735b976ab431d8d9c119608c24d5e) refactor, each stall has it's own respawn timer - [`8200eb0`](https://github.com/2006-Scape/2006Scape/commit/8200eb02107eaff7b88025e5769de935f794f923) refactor argument names - [`ae90b45`](https://github.com/2006-Scape/2006Scape/commit/ae90b4543b1dca5a51eae7f2b7ca2a0022784246) Merge remote-tracking branch 'mrextremez/fixup' into refactor - [`aad40c2`](https://github.com/2006-Scape/2006Scape/commit/aad40c21a6b520291e1c04e0ce9abb893f357547) Update Stalls.java - [`f55fbba`](https://github.com/2006-Scape/2006Scape/commit/f55fbba09673b7352f9945a73432286619806360) Merge pull request #1 from RedSparr0w/refactor ### 📊 Changes **11 files changed** (+216 additions, -166 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/data/cfg/shops.cfg` (+1 -2) 📝 `2006Redone Server/data/doorsbackup.txt` (+0 -1) 📝 `2006Redone Server/data/logs/commands/andrew5.txt` (+1 -0) 📝 `2006Redone Server/src/com/rebotted/GameConstants.java` (+2 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/magic/MagicTeleports.java` (+2 -2) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java` (+2 -2) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/thieving/Pickpocket.java` (+123 -79) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/thieving/Stalls.java` (+78 -69) 📝 `2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java` (+0 -3) 📝 `2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java` (+6 -7) 📝 `2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java` (+1 -0) </details> ### 📄 Description - Changed lumbridge teleport to require 31 magic instead of 32 - Added back gaining items from thieving stalls - Fixed dialgoue issue after leveling up skill (such as smithing) - Made god capes untradable - Removed cannon balls from shop (they werent supposed to be in there) closes #230 closes #228 closes #225 --- <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-05-30 12:21:34 +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#7337
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?