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 #144] [MERGED] Teleother #1046

New Issue
Closed
opened 2026-05-20 10:15:54 +00:00 by Dark98 · 0 comments
Dark98 commented 2026-05-20 10:15:54 +00:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/2006-Scape/2006Scape/pull/144
Author: @Gptaqbc
Created: 11/9/2019
Status: ✅ Merged
Merged: 11/9/2019
Merged by: @dginovker

Base: master ← Head: Teleother

📝 Commits (10+)

  • 1c4be29 Update NpcHandler.class
  • db62ca1 Update NpcHandler.java
  • 8a0b9c3 Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix
  • 6f2334f Merge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix
  • b7b07ac Merge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix
  • c4a28c6 Removing double sell message "You sold x items for x gp".
  • 9a93be5 Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice
  • d08cfde Merge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix
  • 05484f2 reverting stuff I broke in this file
  • caed028 Teleother fixed

📊 Changes

10 files changed (+171 additions, -36 deletions)

View changed files

📝 .gitignore (+1 -0)
📝 .idea/misc.xml (+1 -1)
📝 .idea/workspace.xml (+128 -8)
➕ 2006Redone Server/data/logs/shopbuying/bot.txt (+1 -0)
➕ 2006Redone Server/data/logs/shopselling/bot.txt (+1 -0)
📝 2006Redone Server/src/redone/game/content/combat/CombatAssistant.java (+4 -4)
📝 2006Redone Server/src/redone/game/content/combat/magic/CastOnOther.java (+6 -6)
📝 2006Redone Server/src/redone/game/players/Trading.java (+3 -6)
📝 2006Redone Server/src/redone/game/shops/ShopAssistant.java (+1 -1)
📝 2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java (+25 -10)

📄 Description

Fixed teleother not working! Changed a couple stuff to make them work.
#87

🔄 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/144 **Author:** [@Gptaqbc](https://github.com/Gptaqbc) **Created:** 11/9/2019 **Status:** ✅ Merged **Merged:** 11/9/2019 **Merged by:** [@dginovker](https://github.com/dginovker) **Base:** `master` ← **Head:** `Teleother` --- ### 📝 Commits (10+) - [`1c4be29`](https://github.com/2006-Scape/2006Scape/commit/1c4be29c0d84a36d9ac398aafa261cc823c038af) Update NpcHandler.class - [`db62ca1`](https://github.com/2006-Scape/2006Scape/commit/db62ca1a59aa9fd1d8996acfb1bb09ba5ee0664c) Update NpcHandler.java - [`8a0b9c3`](https://github.com/2006-Scape/2006Scape/commit/8a0b9c3483766134cbca4ef64bf584ea4cadf81c) Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix - [`6f2334f`](https://github.com/2006-Scape/2006Scape/commit/6f2334ffc41e19a0f7622f5c5e16bdf1e1702cd4) Merge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix - [`b7b07ac`](https://github.com/2006-Scape/2006Scape/commit/b7b07ac7971737c97564ad2027d557bbf37d85d0) Merge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix - [`c4a28c6`](https://github.com/2006-Scape/2006Scape/commit/c4a28c619f8f6846fa96ae3954e7a8bc3e30091b) Removing double sell message "You sold x items for x gp". - [`9a93be5`](https://github.com/2006-Scape/2006Scape/commit/9a93be5039d525cd8646f653a826ab9a05a2e4db) Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twice - [`d08cfde`](https://github.com/2006-Scape/2006Scape/commit/d08cfdea093906169c22126d560fdfbc329d8e7f) Merge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix - [`05484f2`](https://github.com/2006-Scape/2006Scape/commit/05484f2873c242159e6c890aa8c80a6c96eb4428) reverting stuff I broke in this file - [`caed028`](https://github.com/2006-Scape/2006Scape/commit/caed028a268ca2a102cbbf9a6938d6206683498f) Teleother fixed ### 📊 Changes **10 files changed** (+171 additions, -36 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -0) 📝 `.idea/misc.xml` (+1 -1) 📝 `.idea/workspace.xml` (+128 -8) ➕ `2006Redone Server/data/logs/shopbuying/bot.txt` (+1 -0) ➕ `2006Redone Server/data/logs/shopselling/bot.txt` (+1 -0) 📝 `2006Redone Server/src/redone/game/content/combat/CombatAssistant.java` (+4 -4) 📝 `2006Redone Server/src/redone/game/content/combat/magic/CastOnOther.java` (+6 -6) 📝 `2006Redone Server/src/redone/game/players/Trading.java` (+3 -6) 📝 `2006Redone Server/src/redone/game/shops/ShopAssistant.java` (+1 -1) 📝 `2006Redone Server/src/redone/net/packets/impl/AttackPlayer.java` (+25 -10) </details> ### 📄 Description Fixed teleother not working! Changed a couple stuff to make them work. #87 --- <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-20 10:15:54 +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#1046
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?