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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ebaca20 Added getHostname to AsyncPlayerPreLoginEvent (#6656)
PaperMC/Paper@0c64d40 Updated Upstream (Bukkit/CraftBukkit) (#7323)
PaperMC/Paper@6663747 Some block state hunks were in the wrong patch (#7308)
PaperMC/Paper@78999b5 Remove redundant getRemoteAddress that can cause an NPE (#7331)
This commit is contained in:
BillyGalbreath
2022-01-13 22:06:23 -06:00
parent 9723e945ab
commit cb1a6366bf
18 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0005-Component-related-conveniences.patch
View File

@@ -36,10 +36,10 @@ index 4b842e78d3e8fbca90f5f3d975bee654ec87d91d..c516ad43cac2419bcf63e11eaa183785
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 f55f8c0b2c748a5442199c0a7f772b02ed533753..e07dd4a0d0918d306512487ee7e989c8b39a7222 100644
index cd08f9b16c065be8f0eacaeba51d3e72d332daf9..ae3c16ec9404f126c50160d436b7732d82765fc5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1373,6 +1373,62 @@ public abstract class PlayerList {
@@ -1377,6 +1377,62 @@ public abstract class PlayerList {
}
// CraftBukkit end
@@ -123,7 +123,7 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..19d6165f266fcc39bc3533042109ef1b
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 335ac54bef892db6b9fe66d0a7c3966abda84350..957407d5fa39445c63d621bd9eafb526bcbf6bce 100644
index 5ded03b80f71111e8480036ae2787b419ac57133..6beb31d68b5d1fc84e396a510a68a488771fcac3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3635,6 +3635,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i