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 #401] [MERGED] A few things #1868

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

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/401
Author: @mrextremez
Created: 4/10/2020
Status: ✅ Merged
Merged: 4/11/2020
Merged by: @dginovker

Base: master ← Head: somestuff

📝 Commits (1)

📊 Changes

19 files changed (+130 additions, -183 deletions)

View changed files

📝 2006Redone Server/src/main/java/com/rebotted/GameConstants.java (+1 -1)
📝 2006Redone Server/src/main/java/com/rebotted/GameEngine.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java (+3 -40)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java (+1 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java (+35 -35)
📝 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/ClimbOther.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/GateHandler.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java (+3 -6)
📝 2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/objects/Objects.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Levers.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java (+2 -2)
📝 2006Redone Server/src/main/java/com/rebotted/game/players/MainFrameIDs.java (+2 -0)
📝 2006Redone Server/src/main/java/com/rebotted/game/players/Player.java (+35 -44)
📝 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAction.java (+2 -0)
📝 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java (+10 -7)
➖ 2006Redone Server/src/main/java/com/rebotted/util/MainFrameIDs.java (+0 -9)
📝 2006Redone Server/src/main/java/com/rebotted/world/clip/ObjectDefinition.java (+7 -7)
📝 2006Redone Server/src/main/java/com/rebotted/world/clip/Region.java (+17 -18)

📄 Description

  • Can't attack players or npcs through doors/walls anymore
  • Cleaned up a few small bits of code
  • Added a few new boundaries to the boundary system
  • Removed dialogue asking are you sure you want to empty your inventory for admins

🔄 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/401 **Author:** [@mrextremez](https://github.com/mrextremez) **Created:** 4/10/2020 **Status:** ✅ Merged **Merged:** 4/11/2020 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `somestuff` --- ### 📝 Commits (1) - [`67a2e2a`](https://github.com/2006-Scape/2006Scape/commit/67a2e2a6166ed1a609a1dd5cc3e6d2f6c32a0d0c) A few things ### 📊 Changes **19 files changed** (+130 additions, -183 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/main/java/com/rebotted/GameConstants.java` (+1 -1) 📝 `2006Redone Server/src/main/java/com/rebotted/GameEngine.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/combat/CombatAssistant.java` (+3 -40) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java` (+1 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java` (+35 -35) 📝 `2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/ClimbOther.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/globalworldobjects/GateHandler.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java` (+3 -6) 📝 `2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectDefaults.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/objects/Objects.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Levers.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java` (+2 -2) 📝 `2006Redone Server/src/main/java/com/rebotted/game/players/MainFrameIDs.java` (+2 -0) 📝 `2006Redone Server/src/main/java/com/rebotted/game/players/Player.java` (+35 -44) 📝 `2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAction.java` (+2 -0) 📝 `2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java` (+10 -7) ➖ `2006Redone Server/src/main/java/com/rebotted/util/MainFrameIDs.java` (+0 -9) 📝 `2006Redone Server/src/main/java/com/rebotted/world/clip/ObjectDefinition.java` (+7 -7) 📝 `2006Redone Server/src/main/java/com/rebotted/world/clip/Region.java` (+17 -18) </details> ### 📄 Description - Can't attack players or npcs through doors/walls anymore - Cleaned up a few small bits of code - Added a few new boundaries to the boundary system - Removed dialogue asking are you sure you want to empty your inventory for admins --- <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-21 10:16:30 +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#1868
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?