mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 17:31:06 +01:00
29a01de126
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: 9a793cce Remove no longer applicable caveats to setPlayerListName 7137829e SPIGOT-4496: Undeprecate MapView.getId and make int de33ade0 Remove some draft API designations a35fa838 SPIGOT-4472: Add Consumer scheduler methods CraftBukkit Changes:8cd538e6SPIGOT-4498: Crash on startupb4ee04baSPIGOT-4496: Undeprecate MapView.getId and make intec937d0eSPIGOT-4472: Add Consumer scheduler methods Spigot Changes: a1f2566f Use monotonic time for watchdog bc4adcbf SPIGOT-4498: Crash on startup bb387e6c Rebuild patches
64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
From 4f2293cad7b7ebfdea3f2d98d6de482f59bc9fff 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 b57b6981d..2096656ee 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -421,6 +421,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
*
|
|
* @param component the components to send
|
|
*/
|
|
+ @Override
|
|
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
|
spigot().sendMessage(component);
|
|
}
|
|
@@ -430,6 +431,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
*
|
|
* @param components the components to send
|
|
*/
|
|
+ @Override
|
|
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
spigot().sendMessage(components);
|
|
}
|
|
--
|
|
2.19.1
|
|
|