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 #58] [MERGED] My development #10183

New Issue
Open
opened 2026-06-03 12:21:18 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-06-03 12:21:18 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/58
Author: @DPSCryptic
Created: 10/13/2019
Status: ✅ Merged
Merged: 10/13/2019
Merged by: @dginovker

Base: master ← Head: my-development

📝 Commits (3)

  • 284da3b Black Knights Fortress (not complete)
  • cd99bdd another Black knight
  • 2003c92 dialogue fix + added comment

📊 Changes

37 files changed (+6213 additions, -5994 deletions)

View changed files

📝 .idea/2006rebotted.iml (+3 -1)
➕ .idea/libraries/commons_lang3_3_1.xml (+17 -0)
➕ .idea/libraries/libs.xml (+7 -0)
📝 .idea/misc.xml (+1 -1)
📝 2006Redone Client/src/ClientSettings.java (+5 -1)
📝 2006Redone Server/src/redone/game/content/quests/QuestAssistant.java (+12 -0)
📝 2006Redone Server/src/redone/game/content/quests/QuestRewards.java (+9 -0)
➕ 2006Redone Server/src/redone/game/content/quests/impl/BlackKnightsFortress.java (+59 -0)
📝 2006Redone Server/src/redone/game/dialogues/DialogueHandler.java (+6057 -5974)
📝 2006Redone Server/src/redone/game/npcs/NpcActions.java (+13 -0)
📝 2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java (+1 -1)
📝 2006Redone Server/src/redone/game/players/Client.java (+9 -13)
📝 2006Redone Server/src/redone/game/players/Player.java (+3 -2)
📝 2006Redone Server/src/redone/game/players/PlayerSave.java (+4 -0)
📝 2006Redone Server/src/redone/integrations/discord/commands/Commands.java (+1 -1)
📝 2006Redone Server/src/redone/net/packets/impl/ClickingButtons.java (+12 -0)
📝 2006Redone file_server/cache/main_file_cache.dat (+0 -0)
📝 2006Redone file_server/cache/main_file_cache.idx0 (+0 -0)
📝 CompiledServer/production/2006rebotted/ClientSettings.class (+0 -0)
➖ CompiledServer/production/2006rebotted/META-INF/2006rebotted.kotlin_module (+0 -0)

...and 17 more files

📄 Description

I've added the Quest 'Black Knights' Fortress'. This Quest can be improved alot tho.

Also, for now i used itemID 291 (notes) as an item you get for killing the black knights, these are not stackable , so these could change of course

🔄 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/58 **Author:** [@DPSCryptic](https://github.com/DPSCryptic) **Created:** 10/13/2019 **Status:** ✅ Merged **Merged:** 10/13/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `my-development` --- ### 📝 Commits (3) - [`284da3b`](https://github.com/2006-Scape/2006Scape/commit/284da3b4fa0e2243c32cc89eb75b27fd2fc07012) Black Knights Fortress (not complete) - [`cd99bdd`](https://github.com/2006-Scape/2006Scape/commit/cd99bddc3a0266a4deef8464b7a4f20342b87f8a) another Black knight - [`2003c92`](https://github.com/2006-Scape/2006Scape/commit/2003c92aea88c89520080c1cb23026641e5b8eef) dialogue fix + added comment ### 📊 Changes **37 files changed** (+6213 additions, -5994 deletions) <details> <summary>View changed files</summary> 📝 `.idea/2006rebotted.iml` (+3 -1) ➕ `.idea/libraries/commons_lang3_3_1.xml` (+17 -0) ➕ `.idea/libraries/libs.xml` (+7 -0) 📝 `.idea/misc.xml` (+1 -1) 📝 `2006Redone Client/src/ClientSettings.java` (+5 -1) 📝 `2006Redone Server/src/redone/game/content/quests/QuestAssistant.java` (+12 -0) 📝 `2006Redone Server/src/redone/game/content/quests/QuestRewards.java` (+9 -0) ➕ `2006Redone Server/src/redone/game/content/quests/impl/BlackKnightsFortress.java` (+59 -0) 📝 `2006Redone Server/src/redone/game/dialogues/DialogueHandler.java` (+6057 -5974) 📝 `2006Redone Server/src/redone/game/npcs/NpcActions.java` (+13 -0) 📝 `2006Redone Server/src/redone/game/npcs/drops/NPCDrops.java` (+1 -1) 📝 `2006Redone Server/src/redone/game/players/Client.java` (+9 -13) 📝 `2006Redone Server/src/redone/game/players/Player.java` (+3 -2) 📝 `2006Redone Server/src/redone/game/players/PlayerSave.java` (+4 -0) 📝 `2006Redone Server/src/redone/integrations/discord/commands/Commands.java` (+1 -1) 📝 `2006Redone Server/src/redone/net/packets/impl/ClickingButtons.java` (+12 -0) 📝 `2006Redone file_server/cache/main_file_cache.dat` (+0 -0) 📝 `2006Redone file_server/cache/main_file_cache.idx0` (+0 -0) 📝 `CompiledServer/production/2006rebotted/ClientSettings.class` (+0 -0) ➖ `CompiledServer/production/2006rebotted/META-INF/2006rebotted.kotlin_module` (+0 -0) _...and 17 more files_ </details> ### 📄 Description I've added the Quest 'Black Knights' Fortress'. This Quest can be improved alot tho. Also, for now i used itemID 291 (notes) as an item you get for killing the black knights, these are not stackable , so these could change of course --- <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-03 12:21:18 +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#10183
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?