diff --git a/Server/data/configs/drop_tables.json b/Server/data/configs/drop_tables.json index e907df0b5..e831c7d29 100644 --- a/Server/data/configs/drop_tables.json +++ b/Server/data/configs/drop_tables.json @@ -11523,7 +11523,7 @@ { "default": [], "charm": [], - "ids": "438,439,440,441,442,443,655,4470", + "ids": "438,439,440,441,442,443,4470", "description": "Tree Spirit (Hostile Woodcutting Random Event/Enchanted Valley)", "main": [ { diff --git a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingNode.java b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingNode.java index c83ef7cc8..ea769da8a 100644 --- a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingNode.java +++ b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingNode.java @@ -320,6 +320,10 @@ public enum WoodcuttingNode { experience = 25.0; level = 36; rewardAmount = Integer.MAX_VALUE; + baseLow = 255; + baseHigh = 255; + tierModLow = 0; + tierModHigh = 0; break; case 30: reward = 3692; diff --git a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java index 00c153744..70bd09d38 100644 --- a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java +++ b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingSkillPulse.java @@ -164,9 +164,10 @@ public class WoodcuttingSkillPulse extends Pulse { player.getSkills().addExperience(Skills.WOODCUTTING, experience, true); - //send the message for the resource reward + //send the message for the resource reward, and in the case of the dramen tree, authentically abort the chopping action if (resource == WoodcuttingNode.DRAMEN_TREE) { player.getPacketDispatch().sendMessage("You cut a branch from the Dramen tree."); + stop(); } else { player.getPacketDispatch().sendMessage("You get some " + ItemDefinition.forId(reward).getName().toLowerCase() + "."); } diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt index b808c812a..0449ca69e 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/lostcity/TreeSpiritNPC.kt @@ -54,12 +54,4 @@ class TreeSpiritNPC(id: Int = 0, location: Location? = null) : AbstractNPC(id, l } } } - - override fun isAttackable(entity: Entity, style: CombatStyle, message: Boolean): Boolean { - if(entity != target) { - return false - } - return super.isAttackable(entity, style, message) - } - }