765a548c68
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: aa81efb0 Remove some additional draft API markings
64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
From 74ed2b2b57a6ce4a0c9b62d594d8b27035b2e2ab Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Tue, 8 Mar 2016 13:05:59 -0800
|
|
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
|
|
index abf68a2c7..fcb03b830 100644
|
|
--- a/src/main/java/org/bukkit/command/CommandSender.java
|
|
+++ b/src/main/java/org/bukkit/command/CommandSender.java
|
|
@@ -58,4 +58,30 @@ public interface CommandSender extends Permissible {
|
|
|
|
Spigot spigot();
|
|
// Spigot end
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to the sender
|
|
+ *
|
|
+ * <p>If this sender does not support sending full components then
|
|
+ * the component will be sent as legacy text.</p>
|
|
+ *
|
|
+ * @param component the component to send
|
|
+ */
|
|
+ default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ this.sendMessage(component.toLegacyText());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to the sender
|
|
+ *
|
|
+ * <p>If this sender does not support sending full components then
|
|
+ * the components will be sent as legacy text.</p>
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ */
|
|
+ default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ this.sendMessage(new net.md_5.bungee.api.chat.TextComponent(components).toLegacyText());
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index a84c6991e..f22f6a881 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -436,6 +436,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
|
*
|
|
* @param component the components to send
|
|
*/
|
|
+ @Override
|
|
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
|
spigot().sendMessage(component);
|
|
}
|
|
@@ -445,6 +446,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
|
*
|
|
* @param components the components to send
|
|
*/
|
|
+ @Override
|
|
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
spigot().sendMessage(components);
|
|
}
|
|
--
|
|
2.18.0
|
|
|