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

@@ -82,7 +82,7 @@ index e40144aad9182ccb2ed871d74378cf0af783c9f1..8e6c0ab117f7c79e51470a1364995217
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 60dd6eb68e500d72e1189322d51d1c1fd71fe881..e6d4bd13bb37329656e2d8931da186d384d3652f 100644
index 668572e6819acdca4b658f693bf9069961dd3366..367a3d1181f29375aed48a861dcf4c2172aa16f9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2091,12 +2091,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -108,10 +108,10 @@ index 60dd6eb68e500d72e1189322d51d1c1fd71fe881..e6d4bd13bb37329656e2d8931da186d3
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index e3a430827f40c00e60256c21e2fbee1b6c1eab5e..95ae7839d7b7596f0692abb6824a172f44710b23 100644
index 168abc1f0c795bf840ca87b301dfa85ac0b5dd16..a9ed0ddc7c5bedb4bca774caa583a6889259e4c0 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -947,6 +947,8 @@ public abstract class PlayerList {
@@ -953,6 +953,8 @@ public abstract class PlayerList {
}
// Paper end