diff options
| author | Krakenied <Krakenied1@gmail.com> | 2024-09-20 18:24:59 +0200 |
|---|---|---|
| committer | Krakenied <46192742+Krakenied@users.noreply.github.com> | 2024-09-20 19:39:06 +0200 |
| commit | 5b8ad15d41157d9c67b48a3d2783010cbf08a9e9 (patch) | |
| tree | 5eb9a56089fa2841395b6cbbc465ec8fe49cf9ae /bukkit/src | |
| parent | 534831b6799b2a752f6beedd717f8bf51a33985a (diff) | |
Check remove-items-when-complete only if partial completion is not allowed
Diffstat (limited to 'bukkit/src')
2 files changed, 4 insertions, 2 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java index 81ebf24e..ecdb0b1f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InventoryTaskType.java @@ -112,7 +112,6 @@ public final class InventoryTaskType extends BukkitTaskType { super.debug("Inventory check triggered", quest.getId(), task.getId(), player.getUniqueId()); - boolean remove = TaskUtils.getConfigBoolean(task, "remove-items-when-complete"); boolean allowPartial = TaskUtils.getConfigBoolean(task, "allow-partial-completion"); QuestItem qi; @@ -167,6 +166,8 @@ public final class InventoryTaskType extends BukkitTaskType { taskProgress.setCompleted(true); super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); + boolean remove = TaskUtils.getConfigBoolean(task, "remove-items-when-complete"); + if (remove) { TaskUtils.removeItemsInSlots(player, amountPerSlot, progress); super.debug("Removing items from inventory", quest.getId(), task.getId(), player.getUniqueId()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/DeliverTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/DeliverTaskType.java index d73a40ff..f927319a 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/DeliverTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/DeliverTaskType.java @@ -97,7 +97,6 @@ public abstract class DeliverTaskType<T> extends BukkitTaskType { } } - boolean remove = TaskUtils.getConfigBoolean(task, "remove-items-when-complete"); boolean allowPartial = TaskUtils.getConfigBoolean(task, "allow-partial-completion"); QuestItem qi; @@ -143,6 +142,8 @@ public abstract class DeliverTaskType<T> extends BukkitTaskType { taskProgress.setCompleted(true); super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); + boolean remove = TaskUtils.getConfigBoolean(task, "remove-items-when-complete"); + if (remove) { TaskUtils.removeItemsInSlots(player, amountPerSlot, progress); super.debug("Removing items from inventory", quest.getId(), task.getId(), player.getUniqueId()); |