mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #144] [MERGED] Teleother #6588
Reference in New Issue
Block a user
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?
📋 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+)
1c4be29Update NpcHandler.classdb62ca1Update NpcHandler.java8a0b9c3Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix6f2334fMerge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fixb7b07acMerge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fixc4a28c6Removing double sell message "You sold x items for x gp".9a93be5Fixing trading bug not working at some places and re commiting the shopAssistant removal of sell message twiced08cfdeMerge remote-tracking branch 'upstream/master' into Buy/Sell-X--Buying-loop-lagging-issue-fix--General-shop-using-fixes--Trading-amount-fix05484f2reverting stuff I broke in this filecaed028Teleother 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.