From 866372ad549f0b1b12de6b6dc6ea5acac5407850 Mon Sep 17 00:00:00 2001 From: Bonesy Date: Sun, 3 Mar 2024 05:44:25 +0000 Subject: [PATCH] Fletching now checks for inventory space before fletching darts, headless arrows, and arrows --- .../global/skill/fletching/items/arrow/ArrowHeadPulse.java | 6 ++++++ .../skill/fletching/items/arrow/HeadlessArrowPulse.java | 6 ++++++ .../global/skill/fletching/items/darts/DartPulse.java | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Server/src/main/content/global/skill/fletching/items/arrow/ArrowHeadPulse.java b/Server/src/main/content/global/skill/fletching/items/arrow/ArrowHeadPulse.java index 927f16d10..5ea27c2cc 100644 --- a/Server/src/main/content/global/skill/fletching/items/arrow/ArrowHeadPulse.java +++ b/Server/src/main/content/global/skill/fletching/items/arrow/ArrowHeadPulse.java @@ -7,6 +7,8 @@ import content.global.skill.fletching.Fletching; import core.game.node.entity.player.Player; import core.game.node.item.Item; +import static core.api.ContentAPIKt.*; + /** * Represents the arrow head pulse to complete the headless arrow. * @author 'Vexia @@ -53,6 +55,10 @@ public class ArrowHeadPulse extends SkillPulse { player.getDialogueInterpreter().sendDialogue("You need a fletching level of " + arrow.level + " to do this."); return false; } + if (!hasSpaceFor(player, arrow.getFinished())) { + sendDialogue(player, "You do not have enough inventory space."); + return false; + } return true; } diff --git a/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessArrowPulse.java b/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessArrowPulse.java index 3ac1ab593..3125b5669 100644 --- a/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessArrowPulse.java +++ b/Server/src/main/content/global/skill/fletching/items/arrow/HeadlessArrowPulse.java @@ -6,6 +6,8 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.item.Item; +import static core.api.ContentAPIKt.*; + /** * Represents the arrow pulse for creating unfinished arrows. * @author 'Vexia @@ -75,6 +77,10 @@ public final class HeadlessArrowPulse extends SkillPulse { } else { useSets = false; } + if (!hasSpaceFor(player, HEADLESS_ARROW.asItem())) { + sendDialogue(player, "You do not have enough inventory space."); + return false; + } return true; } diff --git a/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java b/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java index ec2e31e0e..6f21ba8d7 100644 --- a/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java +++ b/Server/src/main/content/global/skill/fletching/items/darts/DartPulse.java @@ -6,6 +6,8 @@ import content.global.skill.fletching.Fletching; import core.game.node.entity.player.Player; import core.game.node.item.Item; +import static core.api.ContentAPIKt.*; + /** * Represents the dart pulse. * @author ceikry @@ -48,6 +50,10 @@ public final class DartPulse extends SkillPulse { player.getDialogueInterpreter().sendDialogue("You need to have completed Tourist Trap to fletch darts."); return false; } + if (!hasSpaceFor(player, dart.getFinished())) { + sendDialogue(player, "You do not have enough inventory space."); + return false; + } return true; }