Original PR: https://github.com/2006-Scape/2006Scape/pull/212 Author: @RedSparr0w Created: 11/25/2019 Status: ✅ Merged Merged: 11/25/2019 Merged by: @dginovker
Base: master ← Head: fixup
master
fixup
d30a7f4
81 files changed (+192 additions, -217 deletions)
📝 2006Redone Server/src/redone/game/content/combat/magic/CastRequirements.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/combat/magic/MagicTeleports.java (+1 -2) 📝 2006Redone Server/src/redone/game/content/guilds/impl/RangersGuild.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/minigames/castlewars/CastleWars.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/minigames/trawler/Trawler.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/random/PartyRoom.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/randomevents/FreakyForester.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/skills/crafting/GemCutting.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/skills/crafting/Pottery.java (+4 -4) 📝 2006Redone Server/src/redone/game/content/skills/fletching/ArrowMaking.java (+2 -2) 📝 2006Redone Server/src/redone/game/content/skills/fletching/LogCutting.java (+11 -11) 📝 2006Redone Server/src/redone/game/content/skills/fletching/Stringing.java (+2 -2) 📝 2006Redone Server/src/redone/game/content/skills/smithing/SilverCrafting.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/skills/smithing/Smelting.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/skills/smithing/Smithing.java (+1 -1) 📝 2006Redone Server/src/redone/game/content/traveling/Sailing.java (+2 -2) 📝 2006Redone Server/src/redone/game/dialogues/DialogueHandler.java (+59 -60) 📝 2006Redone Server/src/redone/game/items/ItemAssistant.java (+3 -24) 📝 2006Redone Server/src/redone/game/items/UseItem.java (+22 -22) 📝 2006Redone Server/src/redone/game/items/impl/CapeDye.java (+2 -2)
2006Redone Server/src/redone/game/content/combat/magic/CastRequirements.java
2006Redone Server/src/redone/game/content/combat/magic/MagicTeleports.java
2006Redone Server/src/redone/game/content/guilds/impl/RangersGuild.java
2006Redone Server/src/redone/game/content/minigames/castlewars/CastleWars.java
2006Redone Server/src/redone/game/content/minigames/trawler/Trawler.java
2006Redone Server/src/redone/game/content/random/PartyRoom.java
2006Redone Server/src/redone/game/content/randomevents/FreakyForester.java
2006Redone Server/src/redone/game/content/skills/crafting/GemCutting.java
2006Redone Server/src/redone/game/content/skills/crafting/Pottery.java
2006Redone Server/src/redone/game/content/skills/fletching/ArrowMaking.java
2006Redone Server/src/redone/game/content/skills/fletching/LogCutting.java
2006Redone Server/src/redone/game/content/skills/fletching/Stringing.java
2006Redone Server/src/redone/game/content/skills/smithing/SilverCrafting.java
2006Redone Server/src/redone/game/content/skills/smithing/Smelting.java
2006Redone Server/src/redone/game/content/skills/smithing/Smithing.java
2006Redone Server/src/redone/game/content/traveling/Sailing.java
2006Redone Server/src/redone/game/dialogues/DialogueHandler.java
2006Redone Server/src/redone/game/items/ItemAssistant.java
2006Redone Server/src/redone/game/items/UseItem.java
2006Redone Server/src/redone/game/items/impl/CapeDye.java
...and 61 more files
Fixup all nonstackables being deleted when smithing etc.
🔄 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/212
Author: @RedSparr0w
Created: 11/25/2019
Status: ✅ Merged
Merged: 11/25/2019
Merged by: @dginovker
Base:
master← Head:fixup📝 Commits (1)
d30a7f4remove deleteItem2 → deleteItem📊 Changes
81 files changed (+192 additions, -217 deletions)
View changed files
📝
2006Redone Server/src/redone/game/content/combat/magic/CastRequirements.java(+1 -1)📝
2006Redone Server/src/redone/game/content/combat/magic/MagicTeleports.java(+1 -2)📝
2006Redone Server/src/redone/game/content/guilds/impl/RangersGuild.java(+1 -1)📝
2006Redone Server/src/redone/game/content/minigames/castlewars/CastleWars.java(+1 -1)📝
2006Redone Server/src/redone/game/content/minigames/trawler/Trawler.java(+1 -1)📝
2006Redone Server/src/redone/game/content/random/PartyRoom.java(+1 -1)📝
2006Redone Server/src/redone/game/content/randomevents/FreakyForester.java(+1 -1)📝
2006Redone Server/src/redone/game/content/skills/crafting/GemCutting.java(+1 -1)📝
2006Redone Server/src/redone/game/content/skills/crafting/Pottery.java(+4 -4)📝
2006Redone Server/src/redone/game/content/skills/fletching/ArrowMaking.java(+2 -2)📝
2006Redone Server/src/redone/game/content/skills/fletching/LogCutting.java(+11 -11)📝
2006Redone Server/src/redone/game/content/skills/fletching/Stringing.java(+2 -2)📝
2006Redone Server/src/redone/game/content/skills/smithing/SilverCrafting.java(+1 -1)📝
2006Redone Server/src/redone/game/content/skills/smithing/Smelting.java(+1 -1)📝
2006Redone Server/src/redone/game/content/skills/smithing/Smithing.java(+1 -1)📝
2006Redone Server/src/redone/game/content/traveling/Sailing.java(+2 -2)📝
2006Redone Server/src/redone/game/dialogues/DialogueHandler.java(+59 -60)📝
2006Redone Server/src/redone/game/items/ItemAssistant.java(+3 -24)📝
2006Redone Server/src/redone/game/items/UseItem.java(+22 -22)📝
2006Redone Server/src/redone/game/items/impl/CapeDye.java(+2 -2)...and 61 more files
📄 Description
Fixup all nonstackables being deleted when smithing etc.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.