Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c032050 Fix command preprocess cancelling and command changing
PaperMC/Paper@7044a9c Leave a paper.yml.txt stub pointing to new location (#8090)
PaperMC/Paper@4a00cee Readd patch to remove invalid signature on login error
PaperMC/Paper@a817697 Add async catcher to PlayerConnection internalTeleport
PaperMC/Paper@ef42d2a Fix null profile key breaking nullability contracts for PlayerProfile API (#8233)
PaperMC/Paper@3af906b Updated Upstream (Bukkit)
PaperMC/Paper@18a0337 [ci skip] Fix grammatical error in README. (#8189)
PaperMC/Paper@69950d5 Block Ticking API (#7202)
This commit is contained in:
BillyGalbreath
2022-08-04 08:15:54 -05:00
parent e3f739bafd
commit 1fce5dad36
12 changed files with 26 additions and 26 deletions

View File

@@ -17,10 +17,10 @@ index 6cbd839cc7529eb0095485c4ef4a0d81a3cd9b19..3f38159b6a6564ec6b7e01efbdc38d32
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a526b7a8789693c5c24fcf1233183ea317a938d8..904ad8ae42dac7077d5648dac317424742c63652 100644
index c74a7b993a2e0bc0b993b269b90926b2e3673fe7..c074daa9cfa60035e6e9778df27c9f41f7085a0e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3625,6 +3625,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3644,6 +3644,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index a526b7a8789693c5c24fcf1233183ea317a938d8..904ad8ae42dac7077d5648dac3174247
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3649,6 +3650,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3668,6 +3669,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
}