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

@@ -643,10 +643,10 @@ index 122defeec159165c5fef295ec1dd2da4a6ada622..5b7507db055d7be59b369f66e659e128
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 967840be9985f19c76ff79da8faca618f592f78d..f4cf73b3a12ecf2230d1e265e6be2d261e70a659 100644
index 5b26de82b57baaae355e4f32dbd532184b9bc717..502f518bb474c0a0a5f9e8ca03345e5bab5fbbfb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2588,7 +2588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2629,7 +2629,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -655,7 +655,7 @@ index 967840be9985f19c76ff79da8faca618f592f78d..f4cf73b3a12ecf2230d1e265e6be2d26
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2598,7 +2598,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2639,7 +2639,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -664,7 +664,7 @@ index 967840be9985f19c76ff79da8faca618f592f78d..f4cf73b3a12ecf2230d1e265e6be2d26
return;
}
@@ -2611,7 +2611,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2652,7 +2652,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 {