From b5098e54ac494d582a1e5189be26322109299ab9 Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Wed, 22 Mar 2023 13:57:21 +0800 Subject: [PATCH] 1.3.0.2 --- build.gradle | 2 +- .../customfishing/integration/quest/OldBetonQuestCFQuest.java | 4 ++-- .../net/momirealms/customfishing/manager/FishingManager.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 109b1843..997d2cc3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.3.0.1' +version = '1.3.0.2' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customfishing/integration/quest/OldBetonQuestCFQuest.java b/src/main/java/net/momirealms/customfishing/integration/quest/OldBetonQuestCFQuest.java index d8884788..e736afc9 100644 --- a/src/main/java/net/momirealms/customfishing/integration/quest/OldBetonQuestCFQuest.java +++ b/src/main/java/net/momirealms/customfishing/integration/quest/OldBetonQuestCFQuest.java @@ -79,8 +79,8 @@ public class OldBetonQuestCFQuest extends Objective implements Listener { public String getProperty(String name, String playerID) { return switch (name.toLowerCase(Locale.ROOT)) { case "amount" -> - Integer.toString(this.amount - ((FishObjective.FishData) this.dataMap.get(playerID)).getAmount()); - case "left" -> Integer.toString(((FishObjective.FishData) this.dataMap.get(playerID)).getAmount()); + Integer.toString(this.amount - ((OldBetonQuestCFQuest.FishData) this.dataMap.get(playerID)).getAmount()); + case "left" -> Integer.toString(((OldBetonQuestCFQuest.FishData) this.dataMap.get(playerID)).getAmount()); case "total" -> Integer.toString(this.amount); default -> ""; }; diff --git a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java index 8620ed01..97819ee8 100644 --- a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java +++ b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java @@ -777,7 +777,7 @@ public class FishingManager extends Function { return; } - if (!isVanilla && loot != null) { + if (!isVanilla && loot != null && loot.getFailureActions() != null) { for (Action action : loot.getFailureActions()) action.doOn(player, null); }