Upstream/QuickTax
1
0
Fork 1
mirror of https://github.com/tjtanjin/QuickTax.git synced 2024-11-25 06:35:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Fix error with commands sent from command block

Browse Source
This commit is contained in:
tjtanjin 2024-07-15 00:27:52 +08:00
parent db8af6b128
commit 57324fe514
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/tk/taverncraft/quicktax/utils/MessageManager.java
View File

@ -13,6 +13,7 @@ import java.util.regex.Pattern;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
@ -46,6 +47,10 @@ public class MessageManager {
* @param messageKey key to get message with * @param messageKey key to get message with
*/ */
public static void sendMessage(CommandSender sender, String messageKey) { public static void sendMessage(CommandSender sender, String messageKey) {
// if sender is command block, then nothing to send
if (sender instanceof BlockCommandSender) {
return;
}
String message = getMessage(messageKey); String message = getMessage(messageKey);
sender.sendMessage(message); sender.sendMessage(message);
} }
@ -59,6 +64,10 @@ public class MessageManager {
* @param values placeholder values * @param values placeholder values
*/ */
public static void sendMessage(CommandSender sender, String messageKey, String[] keys, String[] values) { public static void sendMessage(CommandSender sender, String messageKey, String[] keys, String[] values) {
// if sender is command block, then nothing to send
if (sender instanceof BlockCommandSender) {
return;
}
String message = getMessage(messageKey); String message = getMessage(messageKey);
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
message = message.replaceAll(keys[i], values[i]); message = message.replaceAll(keys[i], values[i]);