From 534fe1d79168f8810b57bbb50ea941a75f28e36b Mon Sep 17 00:00:00 2001 From: LogGits Date: Sat, 23 Nov 2019 05:41:20 +1000 Subject: [PATCH 1/4] Fixed Basecomponent integration --- .../com/hazebyte/crate/api/util/Messenger.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/hazebyte/crate/api/util/Messenger.java b/src/main/java/com/hazebyte/crate/api/util/Messenger.java index 0ec38c9..0e9dd10 100644 --- a/src/main/java/com/hazebyte/crate/api/util/Messenger.java +++ b/src/main/java/com/hazebyte/crate/api/util/Messenger.java @@ -61,20 +61,11 @@ public static boolean tell (Player player, String msg) { return tell((CommandSender) player, msg); } - public static boolean tell(CommandSender sender, BaseComponent msg) { - return tell(sender, msg, null); // Hack to handle overloading call - } - - public static boolean tell (CommandSender sender, BaseComponent... msg) { - if (sender == null || msg == null) { + public static boolean tell (CommandSender sender, BaseComponent... components) { + if (sender == null || components == null) { return false; } - - for (BaseComponent m : msg) { - if (m instanceof TextComponent) { - tell(sender, (TextComponent) m); - } - } + sender.spigot().sendMessage(components); return true; } @@ -152,7 +143,7 @@ public static boolean broadcast (Object msg) { } if (msg instanceof BaseComponent) { - return broadcast((BaseComponent) msg, null); // Hack + return broadcast(msg, null); // Hack } return broadcast(msg.toString()); } From bfc28ffd9938e42571742c4a75ed2ea3fedfe556 Mon Sep 17 00:00:00 2001 From: LogGits Date: Sun, 24 Nov 2019 05:08:36 +1000 Subject: [PATCH 2/4] Type cast --- src/main/java/com/hazebyte/crate/api/util/Messenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hazebyte/crate/api/util/Messenger.java b/src/main/java/com/hazebyte/crate/api/util/Messenger.java index 0e9dd10..3116206 100644 --- a/src/main/java/com/hazebyte/crate/api/util/Messenger.java +++ b/src/main/java/com/hazebyte/crate/api/util/Messenger.java @@ -112,7 +112,7 @@ public static boolean broadcast (BaseComponent... components) { for (Player player : Players.getOnlinePlayers()) { for (BaseComponent component : components) { - tell((CommandSender) player, component); + tell((CommandSender) player, (BaseComponent) component); } } return true; From c1ba8b8d8a06ce917ad25e3e07296ed3c24277e9 Mon Sep 17 00:00:00 2001 From: LogGits Date: Sun, 24 Nov 2019 05:17:04 +1000 Subject: [PATCH 3/4] 3rd time's a lucky charm --- src/main/java/com/hazebyte/crate/api/util/Messenger.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hazebyte/crate/api/util/Messenger.java b/src/main/java/com/hazebyte/crate/api/util/Messenger.java index 3116206..a3794e1 100644 --- a/src/main/java/com/hazebyte/crate/api/util/Messenger.java +++ b/src/main/java/com/hazebyte/crate/api/util/Messenger.java @@ -112,7 +112,7 @@ public static boolean broadcast (BaseComponent... components) { for (Player player : Players.getOnlinePlayers()) { for (BaseComponent component : components) { - tell((CommandSender) player, (BaseComponent) component); + tell((CommandSender) player, component); } } return true; @@ -143,7 +143,7 @@ public static boolean broadcast (Object msg) { } if (msg instanceof BaseComponent) { - return broadcast(msg, null); // Hack + return broadcast(msg, (BaseComponent) null); // Hack } return broadcast(msg.toString()); } From 77c7a08f6a84ca99d2444220fb731b28fbd9c17a Mon Sep 17 00:00:00 2001 From: LogGits Date: Sun, 24 Nov 2019 05:21:41 +1000 Subject: [PATCH 4/4] it's 5am dont judge me. --- src/main/java/com/hazebyte/crate/api/util/Messenger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hazebyte/crate/api/util/Messenger.java b/src/main/java/com/hazebyte/crate/api/util/Messenger.java index a3794e1..d800a5f 100644 --- a/src/main/java/com/hazebyte/crate/api/util/Messenger.java +++ b/src/main/java/com/hazebyte/crate/api/util/Messenger.java @@ -143,7 +143,7 @@ public static boolean broadcast (Object msg) { } if (msg instanceof BaseComponent) { - return broadcast(msg, (BaseComponent) null); // Hack + return broadcast((BaseComponent) msg, null); // Hack } return broadcast(msg.toString()); }