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 #242] [MERGED] A lot of fixes #4560

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/242
Author: @Gptaqbc
Created: 12/7/2019
Status: ✅ Merged
Merged: 12/8/2019
Merged by: @dginovker

Base: master ← Head: Dunno-what-its-going-to-be

📝 Commits (7)

  • bccf7f9 Fixed stuff related to shop trading
  • 6170799 Merge remote-tracking branch 'upstream/master' into Dunno-what-its-going-to-be
  • 233dfb8 Fixed some stuff related to agility
  • 7df5103 Merge remote-tracking branch 'upstream/master' into Dunno-what-its-going-to-be
  • 6f0f45b resolve conflicts
  • f11116e delete old files
  • cb479d7 A lot of fixes

📊 Changes

16 files changed (+719 additions, -689 deletions)

View changed files

📝 2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/Agility.java (+186 -183)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/PyramidAgility.java (+293 -289)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/WildernessAgility.java (+93 -81)
📝 2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java (+77 -81)
📝 2006Redone Server/src/com/rebotted/game/items/impl/RareProtection.java (+16 -18)
📝 2006Redone Server/src/com/rebotted/game/npcs/drops/NPCDrops.java (+6 -2)
📝 2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java (+12 -16)
📝 2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/BankAll.java (+20 -2)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/BankX2.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java (+1 -2)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnPlayer.java (+9 -7)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/PickupItem.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/WearItem.java (+1 -3)

📄 Description

closes #237
closes #218
closes #201
closes #101

Christmas Cracker (anim other player & text & admin right & rare protection)
Added check in stack value when withdrawing from bank to prevent losing items when max int value is reached
fixed double message on pickpocketing when in combat
Renamed methods
Removed unused methods
Removed admin restriction when trying to use the cannon
Cleaned KBD drops
Boots of lightness weight reduction is fixed
More...

🔄 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/242 **Author:** [@Gptaqbc](https://github.com/Gptaqbc) **Created:** 12/7/2019 **Status:** ✅ Merged **Merged:** 12/8/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `Dunno-what-its-going-to-be` --- ### 📝 Commits (7) - [`bccf7f9`](https://github.com/2006-Scape/2006Scape/commit/bccf7f93de87e874ecc325952fcff71296885447) Fixed stuff related to shop trading - [`6170799`](https://github.com/2006-Scape/2006Scape/commit/61707999e54705923c5b2d87da442b3d682f36cf) Merge remote-tracking branch 'upstream/master' into Dunno-what-its-going-to-be - [`233dfb8`](https://github.com/2006-Scape/2006Scape/commit/233dfb86eef262db233ef67280b25116de5990b3) Fixed some stuff related to agility - [`7df5103`](https://github.com/2006-Scape/2006Scape/commit/7df51033640d787165b5d48d4e96044c64fcb391) Merge remote-tracking branch 'upstream/master' into Dunno-what-its-going-to-be - [`6f0f45b`](https://github.com/2006-Scape/2006Scape/commit/6f0f45b7b024429c9e391d75dc535ee342c4cf5e) resolve conflicts - [`f11116e`](https://github.com/2006-Scape/2006Scape/commit/f11116ee7ec40c05b9404e34508b8b1fea9c3f23) delete old files - [`cb479d7`](https://github.com/2006-Scape/2006Scape/commit/cb479d738fdb748731f51acef2328af3114eac21) A lot of fixes ### 📊 Changes **16 files changed** (+719 additions, -689 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/Agility.java` (+186 -183) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/PyramidAgility.java` (+293 -289) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/WildernessAgility.java` (+93 -81) 📝 `2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java` (+77 -81) 📝 `2006Redone Server/src/com/rebotted/game/items/impl/RareProtection.java` (+16 -18) 📝 `2006Redone Server/src/com/rebotted/game/npcs/drops/NPCDrops.java` (+6 -2) 📝 `2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java` (+12 -16) 📝 `2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/BankAll.java` (+20 -2) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/BankX2.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/ClickNPC.java` (+1 -2) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnPlayer.java` (+9 -7) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/PickupItem.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/WearItem.java` (+1 -3) </details> ### 📄 Description closes #237 closes #218 closes #201 closes #101 Christmas Cracker (anim other player & text & admin right & rare protection) Added check in stack value when withdrawing from bank to prevent losing items when max int value is reached fixed double message on pickpocketing when in combat Renamed methods Removed unused methods Removed admin restriction when trying to use the cannon Cleaned KBD drops Boots of lightness weight reduction is fixed More... --- <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-26 12:21:07 +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#4560
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?