Original PR: https://github.com/2006-Scape/2006Scape/pull/400 Author: @mrextremez Created: 3/23/2020 Status: ✅ Merged Merged: 3/24/2020 Merged by: @dginovker
Base: master ← Head: fightcaves
master
fightcaves
a86b00f
20 files changed (+1118 additions, -918 deletions)
📝 2006Redone Server/src/main/java/com/rebotted/GameConstants.java (+1 -1) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java (+7 -0) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java (+4 -0) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java (+27 -32) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java (+1 -1) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java (+3 -3) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Potatoes.java (+3 -7) 📝 2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/Herblore.java (+1 -2) 📝 2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java (+2 -3) 📝 2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java (+883 -845) 📝 2006Redone Server/src/main/java/com/rebotted/game/items/UseItem.java (+9 -2) 📝 2006Redone Server/src/main/java/com/rebotted/game/items/Weight.java (+5 -2) 📝 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Dye.java (+4 -4) 📝 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java (+0 -2) ➕ 2006Redone Server/src/main/java/com/rebotted/game/items/impl/Greegree.java (+138 -0) 📝 2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java (+5 -6) 📝 2006Redone Server/src/main/java/com/rebotted/game/players/Player.java (+4 -5) 📝 2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java (+13 -0) 📝 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnGroundItem.java (+1 -2) 📝 2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java (+7 -1)
2006Redone Server/src/main/java/com/rebotted/GameConstants.java
2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java
2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java
2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java
2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java
2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java
2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Potatoes.java
2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/Herblore.java
2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java
2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java
2006Redone Server/src/main/java/com/rebotted/game/items/UseItem.java
2006Redone Server/src/main/java/com/rebotted/game/items/Weight.java
2006Redone Server/src/main/java/com/rebotted/game/items/impl/Dye.java
2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java
2006Redone Server/src/main/java/com/rebotted/game/items/impl/Greegree.java
2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java
2006Redone Server/src/main/java/com/rebotted/game/players/Player.java
2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnGroundItem.java
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java
Closes #310 (the majority of stuff on there is fixed)
🔄 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/400
Author: @mrextremez
Created: 3/23/2020
Status: ✅ Merged
Merged: 3/24/2020
Merged by: @dginovker
Base:
master← Head:fightcaves📝 Commits (1)
a86b00fVarious thing📊 Changes
20 files changed (+1118 additions, -918 deletions)
View changed files
📝
2006Redone Server/src/main/java/com/rebotted/GameConstants.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/combat/melee/MeleeData.java(+7 -0)📝
2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java(+4 -0)📝
2006Redone Server/src/main/java/com/rebotted/game/content/minigames/FightCaves.java(+27 -32)📝
2006Redone Server/src/main/java/com/rebotted/game/content/quests/impl/RestlessGhost.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillInterfaces.java(+3 -3)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/cooking/Potatoes.java(+3 -7)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/herblore/Herblore.java(+1 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java(+2 -3)📝
2006Redone Server/src/main/java/com/rebotted/game/items/ItemAssistant.java(+883 -845)📝
2006Redone Server/src/main/java/com/rebotted/game/items/UseItem.java(+9 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/items/Weight.java(+5 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/items/impl/Dye.java(+4 -4)📝
2006Redone Server/src/main/java/com/rebotted/game/items/impl/Flowers.java(+0 -2)➕
2006Redone Server/src/main/java/com/rebotted/game/items/impl/Greegree.java(+138 -0)📝
2006Redone Server/src/main/java/com/rebotted/game/npcs/NpcHandler.java(+5 -6)📝
2006Redone Server/src/main/java/com/rebotted/game/players/Player.java(+4 -5)📝
2006Redone Server/src/main/java/com/rebotted/game/players/PlayerAssistant.java(+13 -0)📝
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/ItemOnGroundItem.java(+1 -2)📝
2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Walking.java(+7 -1)📄 Description
Closes #310 (the majority of stuff on there is fixed)
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.