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

@@ -79,7 +79,7 @@ index 2ec32c4845774f9697c4d8451e20f76806f9888d..8276eff5d8085fe4c4f212d0afc5a36d
return this.stats;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 7759ae9d9ee2549f0e4ccb613d170722b7a1c335..552944305a98cc8c091bab535c2b5cece9953898 100644
index c7748f6d1a460d8d832616b6a16219be59c6e120..ad03d1753bcddd753ed1080f240fc874dcbc06a2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -342,6 +342,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -125,16 +125,16 @@ index 7759ae9d9ee2549f0e4ccb613d170722b7a1c335..552944305a98cc8c091bab535c2b5cec
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1552,7 +1574,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (!this.player.isChangingDimension() && d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
@@ -1570,7 +1592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (!event.isAllowed()) {
flag2 = true; // Paper - diff on change, this should be moved wrongly
if (event.getLogWarning())
- ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
+ ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), d11); // Purpur
+ ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), d11); // Purpur
}
// Paper end
}
// Paper start - optimise out extra getCubes
@@ -1603,6 +1625,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1632,6 +1654,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();