Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-21 18:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Compare against goal amount, fixes #2280

Browse Source
This commit is contained in:
PikaMug 2024-08-20 05:54:49 -04:00
parent 9ae2bc57da
commit 98441a6b65
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/me/pikamug/quests/player/BukkitQuester.java
View File

@ -2245,7 +2245,7 @@ public class BukkitQuester implements Quester {
new BukkitObjective(type, null, amount, goal)); new BukkitObjective(type, null, amount, goal));
plugin.getServer().getPluginManager().callEvent(preEvent); plugin.getServer().getPluginManager().callEvent(preEvent);
final int progress = Math.min(crafted.getAmount() + amount, 64); final int progress = Math.min(crafted.getAmount() + amount, goal.getAmount());
bukkitQuestProgress.itemsCrafted.set(match, progress); bukkitQuestProgress.itemsCrafted.set(match, progress);
if (progress >= goal.getAmount()) { if (progress >= goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null,
@ -2294,7 +2294,7 @@ public class BukkitQuester implements Quester {
new BukkitObjective(type, null, amount, goal)); new BukkitObjective(type, null, amount, goal));
plugin.getServer().getPluginManager().callEvent(preEvent); plugin.getServer().getPluginManager().callEvent(preEvent);
final int progress = Math.min(smelted.getAmount() + amount, 64); final int progress = Math.min(smelted.getAmount() + amount, goal.getAmount());
bukkitQuestProgress.itemsSmelted.set(match, progress); bukkitQuestProgress.itemsSmelted.set(match, progress);
if (progress >= goal.getAmount()) { if (progress >= goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null,
@ -2346,7 +2346,7 @@ public class BukkitQuester implements Quester {
new BukkitObjective(type, null, amount, goal)); new BukkitObjective(type, null, amount, goal));
plugin.getServer().getPluginManager().callEvent(preEvent); plugin.getServer().getPluginManager().callEvent(preEvent);
final int progress = Math.min(enchantedBook.getAmount() + amount, 64); final int progress = Math.min(enchantedBook.getAmount() + amount, goal.getAmount());
bukkitQuestProgress.itemsEnchanted.set(match, progress); bukkitQuestProgress.itemsEnchanted.set(match, progress);
if (progress >= goal.getAmount()) { if (progress >= goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null,
@ -2403,7 +2403,7 @@ public class BukkitQuester implements Quester {
new BukkitObjective(type, null, amount, goal)); new BukkitObjective(type, null, amount, goal));
plugin.getServer().getPluginManager().callEvent(preEvent); plugin.getServer().getPluginManager().callEvent(preEvent);
final int progress = Math.min(enchanted.getAmount() + amount, 64); final int progress = Math.min(enchanted.getAmount() + amount, goal.getAmount());
bukkitQuestProgress.itemsEnchanted.set(match, progress); bukkitQuestProgress.itemsEnchanted.set(match, progress);
if (progress >= goal.getAmount()) { if (progress >= goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null,
@ -2452,7 +2452,7 @@ public class BukkitQuester implements Quester {
new BukkitObjective(type, null, amount, goal)); new BukkitObjective(type, null, amount, goal));
plugin.getServer().getPluginManager().callEvent(preEvent); plugin.getServer().getPluginManager().callEvent(preEvent);
final int progress = Math.min(brewed.getAmount() + amount, 64); final int progress = Math.min(brewed.getAmount() + amount, goal.getAmount());
bukkitQuestProgress.itemsBrewed.set(match, progress); bukkitQuestProgress.itemsBrewed.set(match, progress);
if (progress >= goal.getAmount()) { if (progress >= goal.getAmount()) {
finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null, finishObjective(quest, new BukkitObjective(type, null, progress, goal), null, null, null, null,
@ -2566,7 +2566,7 @@ public class BukkitQuester implements Quester {
return; return;
} }
final int progress = Math.min(delivered.getAmount() + amount, 64); final int progress = Math.min(delivered.getAmount() + amount, goal.getAmount());
bukkitQuestProgress.itemsDelivered.set(match, progress); bukkitQuestProgress.itemsDelivered.set(match, progress);
if (progress >= goal.getAmount()) { if (progress >= goal.getAmount()) {
// Take away remaining amount to be delivered // Take away remaining amount to be delivered