[PR #324] [MERGED] New stuff 6 #12083

New Issue

2026-06-05T12:21:51Z

Dark98 commented

2026-06-05 12:21:51 +00:00

📋 Pull Request Information

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

Base: master ← Head: new-stuff-6

📝 Commits (4)

3fea1c0 Some stuff on weight
a53921e Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog
7538950 Merge remote-tracking branch 'upstream/master' into new-stuff-6
5d55f1f removed a shitload of '== true'

📊 Changes

38 files changed (+157 additions, -157 deletions)

View changed files

📝 2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java (+5 -5)
📝 2006Redone Server/src/com/rebotted/game/content/minigames/castlewars/CastleWars.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/minigames/trawler/Trawler.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java (+7 -7)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/ApeAtollAgility.java (+5 -5)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/BarbarianAgility.java (+6 -6)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/GnomeAgility.java (+7 -7)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/WerewolfAgility.java (+6 -6)
📝 2006Redone Server/src/com/rebotted/game/content/skills/agility/WildernessAgility.java (+4 -4)
📝 2006Redone Server/src/com/rebotted/game/content/skills/crafting/GemCutting.java (+2 -2)
📝 2006Redone Server/src/com/rebotted/game/content/skills/crafting/LeatherMaking.java (+2 -2)
📝 2006Redone Server/src/com/rebotted/game/content/skills/crafting/Pottery.java (+4 -4)
📝 2006Redone Server/src/com/rebotted/game/content/skills/crafting/Spinning.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/skills/firemaking/Firemaking.java (+5 -5)
📝 2006Redone Server/src/com/rebotted/game/content/skills/fletching/ArrowMaking.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/skills/fletching/LogCutting.java (+15 -15)
📝 2006Redone Server/src/com/rebotted/game/content/skills/thieving/ThieveOther.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/content/traveling/GnomeGlider.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java (+6 -6)

...and 18 more files

📄 Description

No description provided

_{🔄 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/324 **Author:** [@Gptaqbc](https://github.com/Gptaqbc) **Created:** 12/25/2019 **Status:** ✅ Merged **Merged:** 12/25/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `new-stuff-6` --- ### 📝 Commits (4) - [`3fea1c0`](https://github.com/2006-Scape/2006Scape/commit/3fea1c0a5e85fdb37a10d16fa901c307351dc0ba) Some stuff on weight - [`a53921e`](https://github.com/2006-Scape/2006Scape/commit/a53921ece4d11b666762de08a29788951b4c9d5b) Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog - [`7538950`](https://github.com/2006-Scape/2006Scape/commit/75389502d9e21ea01635958ddbbd31854b862684) Merge remote-tracking branch 'upstream/master' into new-stuff-6 - [`5d55f1f`](https://github.com/2006-Scape/2006Scape/commit/5d55f1fbc64c3777f4a72003919fe56e2035b1b6) removed a shitload of '== true' ### 📊 Changes **38 files changed** (+157 additions, -157 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/combat/range/DwarfCannon.java` (+5 -5) 📝 `2006Redone Server/src/com/rebotted/game/content/minigames/castlewars/CastleWars.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/minigames/trawler/Trawler.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/SkillHandler.java` (+7 -7) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/ApeAtollAgility.java` (+5 -5) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/BarbarianAgility.java` (+6 -6) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/GnomeAgility.java` (+7 -7) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/WerewolfAgility.java` (+6 -6) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/agility/WildernessAgility.java` (+4 -4) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/crafting/GemCutting.java` (+2 -2) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/crafting/LeatherMaking.java` (+2 -2) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/crafting/Pottery.java` (+4 -4) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/crafting/Spinning.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/firemaking/Firemaking.java` (+5 -5) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/fletching/ArrowMaking.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/fletching/LogCutting.java` (+15 -15) 📝 `2006Redone Server/src/com/rebotted/game/content/skills/thieving/ThieveOther.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/content/traveling/GnomeGlider.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java` (+6 -6) _...and 18 more files_ </details> ### 📄 Description _No description provided_ --- <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-05 12:21:51 +00:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: 2006-Scape/2006Scape#12083