SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broadcast event and add Adventure broadcast (#5477)

Browse Source
This commit is contained in:
Kezz
2021-05-29 23:56:24 +01:00
parent 08bb14c394
commit 0d254aed35
2 changed files with 61 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/Adventure.patch
View File

@@ -1693,8 +1693,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @Deprecated // Paper start
public int broadcastMessage(String message) {
- return broadcast(message, BROADCAST_CHANNEL_USERS);
+ this.sendMessage(io.papermc.paper.adventure.PaperAdventure.LEGACY_SECTION_UXRC.deserialize(message));
+ return this.getOnlinePlayers().size() + 1;
+ return this.broadcast(message, BROADCAST_CHANNEL_USERS);
+ // Paper end
}
@@ -1726,6 +1725,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+
+ @Override
+ public int broadcast(net.kyori.adventure.text.Component message) {
+ return this.broadcast(message, BROADCAST_CHANNEL_USERS);
+ }
+
+ @Override
+ public int broadcast(net.kyori.adventure.text.Component message, String permission) {
+ // Paper end
Set<CommandSender> recipients = new HashSet<>();
@@ -1782,12 +1786,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}
+ // Paper start
@Override
+ @Override
+ public Merchant createMerchant(net.kyori.adventure.text.Component title) {
+ return new org.bukkit.craftbukkit.inventory.CraftMerchantCustom(title == null ? InventoryType.MERCHANT.defaultTitle() : title);
+ }
+ // Paper end
+ @Override
@Override
+ @Deprecated // Paper
public Merchant createMerchant(String title) {
return new CraftMerchantCustom(title == null ? InventoryType.MERCHANT.getDefaultTitle() : title);