From f68a9fb3ad1625ffd0893e867e1573fd778bc324 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:11:27 -0400 Subject: [PATCH] Forced quest messages can be empty, fixes #2221 --- .../subcommands/BukkitQuestadminFinishCommand.java | 2 +- .../questadmin/subcommands/BukkitQuestadminGiveCommand.java | 2 +- .../subcommands/BukkitQuestadminNextstageCommand.java | 2 +- .../subcommands/BukkitQuestadminSetstageCommand.java | 2 +- .../main/java/me/pikamug/quests/player/BukkitQuester.java | 6 +++--- .../src/main/java/me/pikamug/quests/quests/BukkitQuest.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java index af80aebed..cf60a9a6b 100644 --- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java +++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java @@ -106,7 +106,7 @@ public class BukkitQuestadminFinishCommand extends BukkitQuestsSubCommand { String msg2 = BukkitLang.get(p, "questForcedFinish"); msg2 = msg2.replace("", cs.getName()); msg2 = msg2.replace("", quest.getName()); - p.sendMessage(ChatColor.GREEN + msg2); + BukkitLang.send(p, ChatColor.GREEN + msg2); } quest.completeQuest(quester); quester.saveData(); diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java index 533a24531..bda297b7b 100644 --- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java +++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java @@ -121,7 +121,7 @@ public class BukkitQuestadminGiveCommand extends BukkitQuestsSubCommand { String msg2 = BukkitLang.get(p, "questForcedTake"); msg2 = msg2.replace("", cs.getName()); msg2 = msg2.replace("", questToGive.getName()); - p.sendMessage(ChatColor.GREEN + msg2); + BukkitLang.send(p, ChatColor.GREEN + msg2); } quester.takeQuest(questToGive, true); } diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java index 07ca2eb90..cea4345d6 100644 --- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java +++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java @@ -106,7 +106,7 @@ public class BukkitQuestadminNextstageCommand extends BukkitQuestsSubCommand { String msg2 = BukkitLang.get(p, "questForcedNextStage"); msg2 = msg2.replace("", cs.getName()); msg2 = msg2.replace("", quest.getName()); - p.sendMessage(ChatColor.GREEN + msg2); + BukkitLang.send(p, ChatColor.GREEN + msg2); } quest.nextStage(quester, false); quester.saveData(); diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java index f7577db3e..b830ff2bb 100644 --- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java +++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java @@ -113,7 +113,7 @@ public class BukkitQuestadminSetstageCommand extends BukkitQuestsSubCommand { String msg2 = BukkitLang.get("questForcedTake"); msg2 = msg2.replace("", quester.getLastKnownName()); msg2 = msg2.replace("", quest.getName()); - quester.sendMessage(ChatColor.GREEN + msg2); + BukkitLang.send(quester.getPlayer(), ChatColor.GREEN + msg2); } quester.takeQuest(quest, true); quester.saveData(); diff --git a/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java b/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java index 68607e40d..9aee09c5d 100644 --- a/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java +++ b/core/src/main/java/me/pikamug/quests/player/BukkitQuester.java @@ -793,7 +793,7 @@ public class BukkitQuester implements Quester { if (offlinePlayer.isOnline()) { final Player p = getPlayer(); final String title = BukkitLang.get(p, "objectives").replace("", bukkitQuest.getName()); - sendMessage(ChatColor.GOLD + title); + BukkitLang.send(p, ChatColor.GOLD + title); showCurrentObjectives(bukkitQuest, this, false); final String stageStartMessage = stage.getStartMessage(); if (stageStartMessage != null) { @@ -896,8 +896,8 @@ public class BukkitQuester implements Quester { plugin.getLogger().info(getOfflinePlayer().getUniqueId() + " quit quest " + quest.getName()); } for (final String message : messages) { - if (message != null && !message.isEmpty() && getOfflinePlayer().isOnline()) { - sendMessage(message); + if (getOfflinePlayer().isOnline()) { + BukkitLang.send(getPlayer(), message); } } saveData(); diff --git a/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java b/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java index 3001b2624..099e8c770 100644 --- a/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java +++ b/core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java @@ -362,7 +362,7 @@ public class BukkitQuest implements Quest { if (player.isOnline()) { final Player p = quester.getPlayer(); final String title = BukkitLang.get(p, "objectives").replace("", name); - quester.sendMessage(ChatColor.GOLD + title); + BukkitLang.send(p, ChatColor.GOLD + title); quester.showCurrentObjectives(this, quester, false); if (quester.getCurrentStage(this) == null) { quester.sendMessage(ChatColor.RED + "itemCreateCriticalError");