Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2eca2a2 Add Player#sendEquipmentChange(Map) API (#8800)
PaperMC/Paper@b082d89 Win Screen API (#8802)
PaperMC/Paper@b1b19b6 [ci skip] Fix PiglinBarterEvent JavaDoc (#8795)
This commit is contained in:
granny
2023-01-23 00:15:17 -08:00
parent 1dcc7bf149
commit cac8a9b5a8
45 changed files with 43 additions and 92 deletions

View File

@@ -17,7 +17,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..c2ff5d7e4a9f7477b7b207e9d3fb7241
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c89e430cfddb431ee1d20e59f8bd60e3a3a952b9..f79ca89b430636bf5c0e140499ac20f743f22f33 100644
index a50af1f62661622f4a162c7dbad4e7ff056a64ef..6ca749d957ff04f9c6e48271da0046a353508c10 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3505,6 +3505,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,10 +43,10 @@ index c89e430cfddb431ee1d20e59f8bd60e3a3a952b9..f79ca89b430636bf5c0e140499ac20f7
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b32f44beab2c9790ee2da8403e362e8b3ecc6175..d12146a26ccdd534f43616ef8afe14f3883232c3 100644
index 7c43de6ad6bd7259c6bcb2a55e312e8abfcf546b..a67b1164f44e731c6651055c6bb40cee7769d78b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3016,4 +3016,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3029,4 +3029,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end