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

@@ -748,10 +748,10 @@ index c685e0acb2559e7415c94790d8392f0ee997ecc6..ad14dbed67ca622f9c8e05164104fe9a
this.entityManager.saveAll();
} else {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e..cc5adc1a6b6da4d95ea2b5e2f543d472102a7697 100644
index ed4c5762a2fe70e6214fabe14ab5484866da8778..f0ce2e74a57ffbd9bf1aaf7535250c3862f351eb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2592,7 +2592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2611,7 +2611,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -760,7 +760,7 @@ index 9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e..cc5adc1a6b6da4d95ea2b5e2f543d472
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2602,7 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2621,7 +2621,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -769,7 +769,7 @@ index 9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e..cc5adc1a6b6da4d95ea2b5e2f543d472
return;
}
@@ -2615,7 +2615,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2634,7 +2634,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
} finally {