mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #398] [MERGED] Some quick patches #8103
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/398
Author: @mrextremez
Created: 3/13/2020
Status: ✅ Merged
Merged: 3/14/2020
Merged by: @dginovker
Base:
master← Head:quickpatches📝 Commits (2)
473719fSome quick patches429ac13Merge branch 'master' into quickpatches📊 Changes
19 files changed (+221 additions, -218 deletions)
View changed files
📝
2006Redone Server/data/logs/commands/andrew5.txt(+6 -0)📝
2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java(+133 -147)📝
2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Stalls.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java(+1 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/items/Inventory.java(+2 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/items/Item.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java(+38 -35)📝
2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java(+7 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/NPCDropsHandler.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Pickable.java(+10 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/players/Player.java(+0 -6)📝
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java(+2 -2)📝
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickItem.java(+3 -2)📝
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/InterfaceX.java(+8 -6)📝
2006Redone Server/src/main/java/com/rebotted/world/Boundary.java(+0 -1)📝
2006Redone Server/src/main/java/com/rebotted/world/ItemHandler.java(+5 -5)📄 Description
Closes #397
Closes #395
(I also included @Qweqker changes so that will fix Lumbridge bank boundary and adds his new cabbage effect)
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.