Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bend over backwards for reobfJar

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-30 00:25:49 -05:00
parent cff24e3792
commit e299ec5b4f
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
patches/server/0004-Component-related-conveniences.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce 100644
index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..ec98fb6d4a407d5be8faf64db0d73e935e16623d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1389,6 +1389,62 @@ public abstract class PlayerList {
@@ -13,55 +13,55 @@ index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5a344f68176bc9dcc31a1d75ada2afa5
// CraftBukkit end
+ // Purpur start
+ public void sendMessage(@Nullable String message) {
+ sendMessage(message, Util.NIL_UUID);
+ public void broadcast(@Nullable String message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable String message, ChatType type) {
+ sendMessage(message, type, Util.NIL_UUID);
+ public void broadcast(@Nullable String message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable String message, UUID sender) {
+ sendMessage(message, ChatType.SYSTEM, sender);
+ public void broadcast(@Nullable String message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void sendMessage(@Nullable String message, ChatType type, UUID sender) {
+ public void broadcast(@Nullable String message, ChatType type, UUID sender) {
+ if (message != null) {
+ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), type, sender);
+ broadcast(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), type, sender);
+ }
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
+ sendMessage(message, Util.NIL_UUID);
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, ChatType type) {
+ sendMessage(message, type, Util.NIL_UUID);
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
+ sendMessage(message, ChatType.SYSTEM, sender);
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, ChatType type, UUID sender) {
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, ChatType type, UUID sender) {
+ if (message != null) {
+ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type, sender);
+ broadcast(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type, sender);
+ }
+ }
+
+ public void sendMessage(@Nullable Component message) {
+ sendMessage(message, Util.NIL_UUID);
+ public void broadcast(@Nullable Component message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable Component message, ChatType type) {
+ sendMessage(message, type, Util.NIL_UUID);
+ public void broadcast(@Nullable Component message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable Component message, UUID sender) {
+ sendMessage(message, ChatType.SYSTEM, sender);
+ public void broadcast(@Nullable Component message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void sendMessage(@Nullable Component message, ChatType type, UUID sender) {
+ public void broadcast(@Nullable Component message, ChatType type, UUID sender) {
+ if (message != null) {
+ broadcastMessage(message, type, sender);
+ }

4
patches/server/0011-AFK-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4935937ec8da9979b64e1445f74c38cc5f49eec1..7e94441f543c1961c298d1f8699fac16f11440eb 100644
index 4935937ec8da9979b64e1445f74c38cc5f49eec1..cf7945ec299ebbef1d5bb0319f0795b47987bb1a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1927,8 +1927,58 @@ public class ServerPlayer extends Player {
@@ -39,7 +39,7 @@ index 4935937ec8da9979b64e1445f74c38cc5f49eec1..7e94441f543c1961c298d1f8699fac16
+
+ msg = event.getBroadcastMsg();
+ if (msg != null && !msg.isEmpty()) {
+ server.getPlayerList().sendMessage(String.format(msg, this.getGameProfile().getName()));
+ server.getPlayerList().broadcast(String.format(msg, this.getGameProfile().getName()));
+ }
+
+ if (level.purpurConfig.idleTimeoutUpdateTabList) {