Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a0b59ca [ci skip] Update paperweight to 1.4.1
PaperMC/Paper@035f9d7 Fix items never falling after being on ground (#8768)
PaperMC/Paper@214a8c5 Use single player info update packet on join (#8773)
This commit is contained in:
Encode42
2023-01-08 22:04:14 -05:00
parent 9b9dbeec08
commit 2f8ae1bc6d
8 changed files with 21 additions and 21 deletions

View File

@@ -36,10 +36,10 @@ index c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11..f3024b03ff7709893d6e39f54504597b
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 f381bf9064be548a4a603e0042886d8a5e70ba5b..95b1ddc0559f338e99dcacd13ee90587e9e21489 100644
index a01654bb553c00459e64f16e5ccc91b70cc84444..83b080cfd15b03878acca503f0f416166fbc4e5c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1007,6 +1007,20 @@ public abstract class PlayerList {
@@ -1013,6 +1013,20 @@ public abstract class PlayerList {
}
// CraftBukkit end
@@ -81,7 +81,7 @@ index 2848cb7c76e94d8349f042dc92daf01322a6ce5a..0edf0e24b0b311269b447a34f3aad485
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 6a9c0f0b4b749c5907a274d6a83254284d8763bb..3961f66a23508089df8c4ee7455e170cb870e9d0 100644
index 3073b34a0e0281b6b0330721bb0440147de28511..ebc7034d68a1c732ba5b89c95e79660d5505a74c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3863,6 +3863,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {