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
master
quickpatches
473719f
429ac13
19 files changed (+221 additions, -218 deletions)
📝 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)
2006Redone Server/data/logs/commands/andrew5.txt
2006Redone Server/src/main/java/com/rebotted/game/content/consumables/Food.java
2006Redone Server/src/main/java/com/rebotted/game/content/music/sound/CombatSounds.java
2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Pickpocket.java
2006Redone Server/src/main/java/com/rebotted/game/content/skills/thieving/Stalls.java
2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java
2006Redone Server/src/main/java/com/rebotted/game/items/Inventory.java
2006Redone Server/src/main/java/com/rebotted/game/items/Item.java
2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java
2006Redone Server/src/main/java/com/rebotted/game/items/ItemData.java
2006Redone Server/src/main/java/com/rebotted/game/npcs/drops/NPCDropsHandler.java
2006Redone Server/src/main/java/com/rebotted/game/objects/impl/OtherObjects.java
2006Redone Server/src/main/java/com/rebotted/game/objects/impl/Pickable.java
2006Redone Server/src/main/java/com/rebotted/game/players/Player.java
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/BankAll.java
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ClickItem.java
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/InterfaceX.java
2006Redone Server/src/main/java/com/rebotted/world/Boundary.java
2006Redone Server/src/main/java/com/rebotted/world/ItemHandler.java
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.
No dependencies set.
The note is not visible to the blocked user.
📋 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.