diff --git a/Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch index ee29a054eb..143148b31d 100644 --- a/Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0044-Add-String-based-Action-Bar-API.patch @@ -1,22 +1,77 @@ -From bd017a4c0713a165504663f7b82f701eb43accda Mon Sep 17 00:00:00 2001 +From f6d3809067cfa80c033843a9f594b15d044cce64 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 083e60fa..528ed6c9 100644 +index 083e60fa..28a229e0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -392,6 +392,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -392,6 +392,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline public void sendMap(MapView map); // Paper start ++ ++ /** ++ * Sends an Action Bar message to the client. ++ * ++ * Use Section symbols for legacy color codes to send formatting. ++ * ++ * @param message The message to send ++ */ + public void sendActionBar(String message); ++ ++ /** ++ * Sends an Action Bar message to the client. ++ * ++ * Use supplied alternative character to the section symbol to represent legacy color codes. ++ * ++ * @param alternateChar Alternate symbol such as '&' ++ * @param message The message to send ++ */ + public void sendActionBar(char alternateChar, String message); ++ /** * Sends the component to the player * +@@ -415,9 +435,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline + /** + * Sends an array of components as a single message to the specified screen position of this player + * ++ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client. + * @param position the screen position + * @param components the components to send + */ ++ @Deprecated + public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { + spigot().sendMessage(position, components); + } +@@ -1663,9 +1685,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline + /** + * Sends the component to the specified screen position of this player + * ++ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client. + * @param position the screen position + * @param component the components to send + */ ++ @Deprecated + public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) { + throw new UnsupportedOperationException("Not supported yet."); + } +@@ -1673,9 +1697,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline + /** + * Sends an array of components as a single message to the specified screen position of this player + * ++ * @deprecated This is unlikely the API you want to use. See {@link #sendActionBar(String)} for a more proper Action Bar API. This deprecated API may send unsafe items to the client. + * @param position the screen position +- * @param component the components to send ++ * @param components the components to send + */ ++ @Deprecated + public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { + throw new UnsupportedOperationException("Not supported yet."); + } -- 2.11.0