Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-06-26 06:35:01 +02:00
Code Issues Projects Releases Wiki Activity

Forced quest messages can be empty, fixes #2221

Browse Source
This commit is contained in:
PikaMug 2024-06-05 11:11:27 -04:00
parent e39c5aac25
commit f68a9fb3ad
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java
View File

@ -106,7 +106,7 @@ public class BukkitQuestadminFinishCommand extends BukkitQuestsSubCommand {
String msg2 = BukkitLang.get(p, "questForcedFinish");
msg2 = msg2.replace("<player>", cs.getName());
msg2 = msg2.replace("<quest>", quest.getName());
p.sendMessage(ChatColor.GREEN + msg2);
BukkitLang.send(p, ChatColor.GREEN + msg2);
}
quest.completeQuest(quester);
quester.saveData();

2
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java
View File

@ -121,7 +121,7 @@ public class BukkitQuestadminGiveCommand extends BukkitQuestsSubCommand {
String msg2 = BukkitLang.get(p, "questForcedTake");
msg2 = msg2.replace("<player>", cs.getName());
msg2 = msg2.replace("<quest>", questToGive.getName());
p.sendMessage(ChatColor.GREEN + msg2);
BukkitLang.send(p, ChatColor.GREEN + msg2);
}
quester.takeQuest(questToGive, true);
}

2
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java
View File

@ -106,7 +106,7 @@ public class BukkitQuestadminNextstageCommand extends BukkitQuestsSubCommand {
String msg2 = BukkitLang.get(p, "questForcedNextStage");
msg2 = msg2.replace("<player>", cs.getName());
msg2 = msg2.replace("<quest>", quest.getName());
p.sendMessage(ChatColor.GREEN + msg2);
BukkitLang.send(p, ChatColor.GREEN + msg2);
}
quest.nextStage(quester, false);
quester.saveData();

2
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java
View File

@ -113,7 +113,7 @@ public class BukkitQuestadminSetstageCommand extends BukkitQuestsSubCommand {
String msg2 = BukkitLang.get("questForcedTake");
msg2 = msg2.replace("<player>", quester.getLastKnownName());
msg2 = msg2.replace("<quest>", quest.getName());
quester.sendMessage(ChatColor.GREEN + msg2);
BukkitLang.send(quester.getPlayer(), ChatColor.GREEN + msg2);
}
quester.takeQuest(quest, true);
quester.saveData();

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

@ -793,7 +793,7 @@ public class BukkitQuester implements Quester {
if (offlinePlayer.isOnline()) {
final Player p = getPlayer();
final String title = BukkitLang.get(p, "objectives").replace("<quest>", 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();

2
core/src/main/java/me/pikamug/quests/quests/BukkitQuest.java
View File

@ -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("<quest>", 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");