Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
3dc82c200 deprecate IllegalPacketEvent (#4867)
This commit is contained in:
BillyGalbreath
2020-12-08 11:07:54 -06:00
parent 69790ff3ff
commit 1b40f871b8
10 changed files with 30 additions and 30 deletions

View File

@@ -149,10 +149,10 @@ index b5e1a860a2..5f85a1d513 100644
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 12ce5b106d..13da04e5b3 100644
index 1c8b477f83..347675d6db 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -247,6 +247,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -245,6 +245,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
@@ -165,7 +165,7 @@ index 12ce5b106d..13da04e5b3 100644
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
@@ -503,6 +509,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -501,6 +507,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -174,7 +174,7 @@ index 12ce5b106d..13da04e5b3 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1204,7 +1212,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1202,7 +1210,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
flag1 = true;
@@ -183,7 +183,7 @@ index 12ce5b106d..13da04e5b3 100644
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1243,6 +1251,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1241,6 +1249,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();