mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
3a70bed5f4
I have tested that the Replenishing Feature still works as expected.
Lootable API's that now have Bukkit equivalents are now deprecated.
Bukkit Changes:
f0f33981 SPIGOT-1936: LootTable API
CraftBukkit Changes:
c0df4b82 SPIGOT-1936: LootTable API
113 lines
3.8 KiB
Diff
113 lines
3.8 KiB
Diff
From 2db0dd58deef0d809785c129438ddc919ecf0d7d Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
|
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|
|
|
Change Javadoc to be accurate
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index dbfd6e41d..4c5e0035a 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -281,6 +281,26 @@ public final class Bukkit {
|
|
return server.broadcastMessage(message);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to all online players.
|
|
+ *
|
|
+ * @param component the component to send
|
|
+ */
|
|
+ public static void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ server.broadcast(component);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to all online players.
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ */
|
|
+ public static void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ server.broadcast(components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the name of the update folder. The update folder is used to safely
|
|
* update plugins at the right moment on a plugin load.
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index c23ae761e..4f9dd992a 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -229,6 +229,26 @@ public interface Server extends PluginMessageRecipient {
|
|
*/
|
|
public int broadcastMessage(String message);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to all online players.
|
|
+ *
|
|
+ * @param component the component to send
|
|
+ */
|
|
+ public default void broadcast(net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ spigot().broadcast(component);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to all online players.
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ */
|
|
+ public default void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ spigot().broadcast(components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the name of the update folder. The update folder is used to safely
|
|
* update plugins at the right moment on a plugin load.
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index e5e611201..45e9484dc 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -439,6 +439,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
|
*/
|
|
public void sendMap(MapView map);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Sends the component to the player
|
|
+ *
|
|
+ * @param component the components to send
|
|
+ */
|
|
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
|
+ spigot().sendMessage(component);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to the player
|
|
+ *
|
|
+ * @param components the components to send
|
|
+ */
|
|
+ public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ spigot().sendMessage(components);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sends an array of components as a single message to the specified screen position of this player
|
|
+ *
|
|
+ * @param position the screen position
|
|
+ * @param components the components to send
|
|
+ */
|
|
+ public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
|
+ spigot().sendMessage(position, components);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Forces an update of the player's entire inventory.
|
|
*
|
|
--
|
|
2.18.0
|
|
|