Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5274ad6 Add and implement PlayerFailMoveEvent (#9535)
PaperMC/Paper@ef2b574 Clone location in PlayerFailMoveEvent getters
This commit is contained in:
granny
2023-08-07 20:51:50 -07:00
parent 0e36fd08b8
commit a52c4a41a4
13 changed files with 35 additions and 35 deletions

View File

@@ -1791,7 +1791,7 @@ index dc5fda83a66afbfeb7897fc20b4742899d8aca08..1f49a53033a6f7f0e70b655531f2fbb4
@Override
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..81c566877ad7ac98fcd9fe94d8e0c09f88fb2054 100644
index 80e050603e36134754136a8ee2bd14624f976e91..f2e71c26c889bdee2cd2b86dcde9d4c35a3574bd 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1221,6 +1221,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1802,7 +1802,7 @@ index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..81c566877ad7ac98fcd9fe94d8e0c09f
// Paper start
if (!this.cserver.isPrimaryThread()) {
List<String> pageList = packet.getPages();
@@ -2367,6 +2368,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2408,6 +2409,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
private boolean updateChatOrder(Instant timestamp) {