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

rebase on latest paper

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-25 06:58:21 -05:00
parent 108644cca2
commit 8503ea0b19
24 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0005-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 87a15e63671f9e22283745b04af5e23e8296984f..ba31b14bf27fe43eeacf067755ecf45dd50d3ff5 100644
index c856b38b49969f6eb0b2a82bff6d80967857643d..ed8b90e90dc4878bce9eecbbf944f5264630f6bb 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1663,6 +1663,26 @@ public class ServerPlayer extends Player {
@@ -1693,6 +1693,26 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end
@@ -36,10 +36,10 @@ index 87a15e63671f9e22283745b04af5e23e8296984f..ba31b14bf27fe43eeacf067755ecf45d
public void displayClientMessage(Component message, boolean actionBar) {
this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index dca3b995c02507e5df299abe60f518480ce56d21..50bdaf7edc14f6de7ed5562df9d6ed424a022f80 100644
index f90eea21300746ef510e6dccc1eda9cca6ac5a64..0e647bb7b4efefe8a56d8b9c01f747feea700e96 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1359,6 +1359,62 @@ public abstract class PlayerList {
@@ -1372,6 +1372,62 @@ public abstract class PlayerList {
}
// CraftBukkit end
@@ -103,10 +103,10 @@ index dca3b995c02507e5df299abe60f518480ce56d21..50bdaf7edc14f6de7ed5562df9d6ed42
this.server.sendMessage(message, sender);
Iterator iterator = this.players.iterator();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index dcfc726ab96dccc05848219e824ad7612dbfbdab..30f11e94e18222bb69c4c69f688923ef62877a8e 100644
index 3febcc7e88b74d4bdb45e633fdaa9d3313a6ae0b..23c17a1ebb63290168b2b67f2dbeb7741c368e7b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3378,6 +3378,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3514,6 +3514,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
return SlotAccess.NULL;
}