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

Update to 1.19.1

Browse Source
This commit is contained in:
BillyGalbreath
2022-07-27 23:53:11 -05:00
parent 85f63e5df0
commit f1c4bad9ce
263 changed files with 522 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0007-Component-related-conveniences.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index cf6388c6d339cf011ce0a254b0aacb51fd06347b..bcd496de1e4d38dd527705057f6c3152f0bd8e0d 100644
index 94d87f6bd2c27b0d6cc4547e8bc6e87b95f1ad32..db23ce6f9253697592d80e44c192e9a97d06b83b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1706,6 +1706,26 @@ public class ServerPlayer extends Player {
@@ -1704,6 +1704,26 @@ public class ServerPlayer extends Player {
this.lastSentExp = -1; // CraftBukkit - Added to reset
}
@@ -33,26 +33,26 @@ index cf6388c6d339cf011ce0a254b0aacb51fd06347b..bcd496de1e4d38dd527705057f6c3152
+ // Purpur end
+
@Override
public void displayClientMessage(Component message, boolean actionBar) {
this.sendSystemMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.SYSTEM);
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 20cdfdb3b9351f74e89bc45b3ab972384165659a..13de18b40c2f80ccd9c0ce512e759dbc2804ff83 100644
index 37d8a797bb590c30bf42ab04128489a9390684d3..3ef2c88ddec0f7088d1d88d1d98286bed382e1c1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1067,6 +1067,20 @@ public abstract class PlayerList {
@@ -1068,6 +1068,20 @@ public abstract class PlayerList {
}
// CraftBukkit end
+ // Purpur Start
+ public void broadcastMiniMessage(@Nullable String message, ResourceKey<ChatType> type) {
+ public void broadcastMiniMessage(@Nullable String message, boolean overlay) {
+ if (message != null && !message.isEmpty()) {
+ this.broadcastMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), type);
+ this.broadcastMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), overlay);
+ }
+ }
+
+ public void broadcastMessage(@Nullable net.kyori.adventure.text.Component message, ResourceKey<ChatType> type) {
+ public void broadcastMessage(@Nullable net.kyori.adventure.text.Component message, boolean overlay) {
+ if (message != null) {
+ this.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type);
+ this.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), overlay);
+ }
+ }
+ // Purpur end
@@ -81,10 +81,10 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3cb33e63a06a7baa013dbb0038debd7f683a6f4a..0a4f939c14ce6cc84b0833e417591ee2cb9a50fd 100644
index 9630d95ad2d47bb4a043dcb143bb58cd183c00c1..d189f7141a7e93ceb62a2ee22dd529e477ca055e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3786,6 +3786,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3783,6 +3783,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}