Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a6a197b1 Bump API ASM version to follow server
5ab48ad9 Fix commodore (#3264)
87e7ee7e Improve Async Login to avoid firing in middle of Entity Ticking
This commit is contained in:
William Blake Galbreath
2020-05-01 14:35:02 -05:00
parent 2e50cb0eed
commit f94d5bfe59
6 changed files with 18 additions and 18 deletions

View File

@@ -1,4 +1,4 @@
From e0d27800ad2634b7b2dc0ed66dca4b664c9fe5d6 Mon Sep 17 00:00:00 2001
From edfef3a8ba11f70379845c75a0afe5caa89b4432 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -171,10 +171,10 @@ index 1398c47a2..0bf1a14b7 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1a6cb78c5..80770d1ef 100644
index 940acf07c..68ec9b5f3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -224,6 +224,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -235,6 +235,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)) {
@@ -187,7 +187,7 @@ index 1a6cb78c5..80770d1ef 100644
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
}
@@ -440,6 +446,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -451,6 +457,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -196,7 +196,7 @@ index 1a6cb78c5..80770d1ef 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1109,6 +1117,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1120,6 +1128,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();