diff options
Diffstat (limited to 'bukkit')
48 files changed, 50 insertions, 50 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java index d364c7e7..21b9c0ea 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockItemdroppingTaskType.java @@ -110,7 +110,7 @@ public final class BlockItemdroppingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java index 1a17567c..cb7dd8c3 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BlockshearingTaskType.java @@ -62,7 +62,7 @@ public final class BlockshearingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java index efcc5e79..b0dbc61d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BreedingTaskType.java @@ -116,7 +116,7 @@ public final class BreedingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java index 20c61209..7814ed54 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BrewingTaskType.java @@ -125,7 +125,7 @@ public final class BrewingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java index 9bc6b2be..1dc336c2 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BucketInteractionTaskType.java @@ -57,7 +57,7 @@ public abstract class BucketInteractionTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java index 9729d547..273604ef 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/BuildingTaskType.java @@ -66,7 +66,7 @@ public final class BuildingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } @@ -115,7 +115,7 @@ public final class BuildingTaskType extends BukkitTaskType { super.debug("Decrementing task progress (now " + progress + ")", quest.getId(), task.getId(), player.getUniqueId()); int amount = (int) task.getConfigValue("amount"); - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CompostingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CompostingTaskType.java index 39e0a857..a4aaa9eb 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CompostingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CompostingTaskType.java @@ -84,7 +84,7 @@ public final class CompostingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java index b0fcd213..4fbcb5e4 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ConsumeTaskType.java @@ -84,7 +84,7 @@ public final class ConsumeTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java index 332d2e4c..876ca039 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/CraftingTaskType.java @@ -114,7 +114,7 @@ public final class CraftingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java index e2131f37..fef815ec 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/DealDamageTaskType.java @@ -70,7 +70,7 @@ public final class DealDamageTaskType extends BukkitTaskType { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java index fb2b63b4..cc380c83 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/EnchantingTaskType.java @@ -110,7 +110,7 @@ public final class EnchantingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, enchantsNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, enchantsNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java index da0a7fb9..b8ae4a1c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ExpEarnTaskType.java @@ -55,7 +55,7 @@ public final class ExpEarnTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, expNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, expNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java index ffad0a6d..4c30c156 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FarmingTaskType.java @@ -139,7 +139,7 @@ public final class FarmingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java index f174119a..6bd0309a 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/FishingTaskType.java @@ -96,7 +96,7 @@ public final class FishingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java index ebea3150..f65067c0 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/InteractTaskType.java @@ -101,7 +101,7 @@ public final class InteractTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } 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 d06cc204..969c8c29 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 @@ -165,7 +165,7 @@ public final class InventoryTaskType extends BukkitTaskType { } } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } }
\ No newline at end of file diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java index 1cec5ffc..20c27fb6 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MilkingTaskType.java @@ -86,7 +86,7 @@ public final class MilkingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java index a728d45f..b6a9da07 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MiningTaskType.java @@ -138,7 +138,7 @@ public final class MiningTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); }; boolean coreProtectEnabled = TaskUtils.getConfigBoolean(task, "check-coreprotect"); @@ -218,7 +218,7 @@ public final class MiningTaskType extends BukkitTaskType { super.debug("Decrementing task progress (now " + progress + ")", quest.getId(), task.getId(), player.getUniqueId()); int amount = (int) task.getConfigValue("amount"); - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java index 81da75f7..68ec3095 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/MobkillingTaskType.java @@ -169,7 +169,7 @@ public final class MobkillingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java index e5f46ae7..c6d4eb9d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlayerkillingTaskType.java @@ -58,7 +58,7 @@ public final class PlayerkillingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(killer, quest, task, taskProgress, playerKillsNeeded); + TaskUtils.sendTrackAdvancement(killer, quest, task, pendingTask, playerKillsNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java index b7af83d2..3ca75a16 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/PlaytimeTaskType.java @@ -94,7 +94,7 @@ public final class PlaytimeTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, minutes); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, minutes); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ProjectilelaunchingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ProjectilelaunchingTaskType.java index 8c3c8057..586da105 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ProjectilelaunchingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ProjectilelaunchingTaskType.java @@ -66,7 +66,7 @@ public final class ProjectilelaunchingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java index 1b973b79..6e359cfa 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ReplenishingTaskType.java @@ -82,7 +82,7 @@ public final class ReplenishingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java index f4433b49..2640a63c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/ShearingTaskType.java @@ -70,7 +70,7 @@ public final class ShearingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java index 92ff158d..3d7e42f3 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmeltingTaskType.java @@ -131,7 +131,7 @@ public final class SmeltingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java index d154b45e..44b5a124 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/SmithingTaskType.java @@ -121,7 +121,7 @@ public final class SmithingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java index 1e19558d..c3fd0f59 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/TamingTaskType.java @@ -68,7 +68,7 @@ public final class TamingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java index 8cad2df2..92768e8f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java @@ -107,7 +107,7 @@ public final class WalkingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, distanceNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, distanceNeeded); } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java index f192cc96..8acb673a 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ASkyBlockLevelTaskType.java @@ -52,7 +52,7 @@ public final class ASkyBlockLevelTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java index bff1d22f..fd18c916 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/BentoBoxLevelTaskType.java @@ -72,7 +72,7 @@ public final class BentoBoxLevelTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandLevelNeeded); } } } 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 38c6f779..da22b507 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 @@ -148,7 +148,7 @@ public abstract class DeliverTaskType<T> extends BukkitTaskType { } } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java index 8f58b89c..a420c853 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoBossesKillingTaskType.java @@ -64,7 +64,7 @@ public final class EcoBossesKillingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoMobsKillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoMobsKillingTaskType.java index 3de6b2d8..c10aca6b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoMobsKillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EcoMobsKillingTaskType.java @@ -64,7 +64,7 @@ public final class EcoMobsKillingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java index 9bf483d7..8f1476ed 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsBalanceTaskType.java @@ -96,7 +96,7 @@ public final class EssentialsBalanceTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, earningsNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, earningsNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java index b0245156..ff809a65 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/EssentialsMoneyEarnTaskType.java @@ -70,7 +70,7 @@ public final class EssentialsMoneyEarnTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, earningsNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, earningsNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyBlockLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyBlockLevelTaskType.java index b89cc032..2f5e420c 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyBlockLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/FabledSkyBlockLevelTaskType.java @@ -125,7 +125,7 @@ public final class FabledSkyBlockLevelTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java index cf480da8..3c2b970b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/IridiumSkyblockValueTaskType.java @@ -67,7 +67,7 @@ public final class IridiumSkyblockValueTaskType extends BukkitTaskType { taskProgress.setProgress(islandValueNeeded); taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandValueNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandValueNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java index 70aba8ea..10be34fe 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/MythicMobsKillingTaskType.java @@ -130,7 +130,7 @@ public final class MythicMobsKillingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java index 3db9ad5f..e2c07e3d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/NuVotifierVoteTaskType.java @@ -56,7 +56,7 @@ public final class NuVotifierVoteTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, votesNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, votesNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PinataPartyHitTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PinataPartyHitTaskType.java index d21b811c..61d20542 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PinataPartyHitTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PinataPartyHitTaskType.java @@ -54,7 +54,7 @@ public final class PinataPartyHitTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlaceholderAPIEvaluateTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlaceholderAPIEvaluateTaskType.java index f6c71602..7d371cc2 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlaceholderAPIEvaluateTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlaceholderAPIEvaluateTaskType.java @@ -161,7 +161,7 @@ public final class PlaceholderAPIEvaluateTaskType extends BukkitTaskType { } // Do not send track advancement for this task type as it behaves really weird - //TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, evaluates); + //TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, evaluates); } else if (evaluatedString.equals(evaluatesString)) { super.debug("Marking task as complete", quest.getId(), task.getId(), player.getUniqueId()); taskProgress.setCompleted(true); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java index 10736327..bff1b181 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PlayerPointsEarnTaskType.java @@ -62,7 +62,7 @@ public final class PlayerPointsEarnTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PyroFishingProFishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PyroFishingProFishingTaskType.java index b3399580..bbd11c41 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PyroFishingProFishingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/PyroFishingProFishingTaskType.java @@ -84,7 +84,7 @@ public final class PyroFishingProFishingTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amount); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amount); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java index b38a717f..bdc7c2a4 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/ShopGUIPlusInteractionTaskType.java @@ -123,7 +123,7 @@ public abstract class ShopGUIPlusInteractionTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, amountNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, amountNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java index f9316d28..880632af 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockLevelType.java @@ -60,7 +60,7 @@ public final class SuperiorSkyblockLevelType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java index c16c650c..da6a4274 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/SuperiorSkyblockWorthType.java @@ -60,7 +60,7 @@ public final class SuperiorSkyblockWorthType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandLevelNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java index 6b09c1d6..ab05820d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/VotingPluginVoteType.java @@ -56,7 +56,7 @@ public final class VotingPluginVoteType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, votesNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, votesNeeded); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java index 65fca94b..ce7d43a9 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/uSkyBlockLevelTaskType.java @@ -51,7 +51,7 @@ public final class uSkyBlockLevelTaskType extends BukkitTaskType { taskProgress.setCompleted(true); } - TaskUtils.sendTrackAdvancement(player, quest, task, taskProgress, islandLevelNeeded); + TaskUtils.sendTrackAdvancement(player, quest, task, pendingTask, islandLevelNeeded); } } } |