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 #328] [MERGED] Gptaqbc new stuff 6 #3215

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

📋 Pull Request Information

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

Base: master ← Head: Gptaqbc-new-stuff-6

📝 Commits (10+)

  • 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'
  • 8fa0042 Fixed drop issue
  • 8c9f9c8 Fixed duel arena, changed some chat message so they are all the same, changed Additem
  • 80a2178 Update ItemAssistant.java
  • 8b2876c Merge remote-tracking branch 'upstream/master' into new-stuff-6
  • 0325c9f Resolving my issues
  • ec86832 Allow walking during movement

📊 Changes

32 files changed (+80 additions, -41 deletions)

View changed files

📝 2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java (+1 -0)
📝 2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java (+18 -24)
📝 2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java (+3 -1)
📝 2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java (+4 -1)
📝 2006Redone Server/src/com/rebotted/game/players/Player.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java (+7 -2)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/AttackPlayer.java (+16 -2)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java (+7 -2)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/ClickingStuff.java (+1 -2)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/PickupItem.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java (+2 -3)
📝 2006Redone Server/src/com/rebotted/world/GlobalDropsHandler.java (+1 -1)
📝 2006Redone Server/src/com/rebotted/world/ItemHandler.java (+18 -1)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/CombatAssistant.class (+0 -0)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/content/minigames/Dueling.class (+0 -0)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class (+0 -0)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$1.class (+0 -0)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$2.class (+0 -0)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$3.class (+0 -0)
📝 CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$4.class (+0 -0)

...and 12 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/328 **Author:** [@dginovker](https://github.com/dginovker) **Created:** 12/26/2019 **Status:** ✅ Merged **Merged:** 12/26/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `Gptaqbc-new-stuff-6` --- ### 📝 Commits (10+) - [`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' - [`8fa0042`](https://github.com/2006-Scape/2006Scape/commit/8fa0042f1e8c71484be0ff6ac35b1a197701b664) Fixed drop issue - [`8c9f9c8`](https://github.com/2006-Scape/2006Scape/commit/8c9f9c8f1fc0a4b58959c79611f8fee96a8eabe2) Fixed duel arena, changed some chat message so they are all the same, changed Additem - [`80a2178`](https://github.com/2006-Scape/2006Scape/commit/80a21784cbe9a23a78175bbea7319443512c04e3) Update ItemAssistant.java - [`8b2876c`](https://github.com/2006-Scape/2006Scape/commit/8b2876cc6c10def925398acb4a0fa3f0e0f7eb74) Merge remote-tracking branch 'upstream/master' into new-stuff-6 - [`0325c9f`](https://github.com/2006-Scape/2006Scape/commit/0325c9f4a57b430a3f3653b1d93dfc612e39980f) Resolving my issues - [`ec86832`](https://github.com/2006-Scape/2006Scape/commit/ec868321b017c8255967ba01bc1bd5f0b7ea4aa1) Allow walking during movement ### 📊 Changes **32 files changed** (+80 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `2006Redone Server/src/com/rebotted/game/content/combat/CombatAssistant.java` (+1 -0) 📝 `2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java` (+18 -24) 📝 `2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java` (+3 -1) 📝 `2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java` (+4 -1) 📝 `2006Redone Server/src/com/rebotted/game/players/Player.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java` (+7 -2) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/AttackPlayer.java` (+16 -2) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java` (+7 -2) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/ClickingStuff.java` (+1 -2) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/PickupItem.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java` (+2 -3) 📝 `2006Redone Server/src/com/rebotted/world/GlobalDropsHandler.java` (+1 -1) 📝 `2006Redone Server/src/com/rebotted/world/ItemHandler.java` (+18 -1) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/content/combat/CombatAssistant.class` (+0 -0) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/content/minigames/Dueling.class` (+0 -0) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/items/ItemAssistant.class` (+0 -0) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$1.class` (+0 -0) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$2.class` (+0 -0) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$3.class` (+0 -0) 📝 `CompiledServer/production/2006rebotted/com/rebotted/game/objects/ObjectsActions$4.class` (+0 -0) _...and 12 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-05-24 12:21:04 +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#3215
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?