Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
86daffa2 Fix AssertionError when player hand set to empty type
This commit is contained in:
William Blake Galbreath
2019-12-09 19:28:05 -06:00
parent 8cb622fe75
commit fbc3f0d6bf
10 changed files with 133 additions and 133 deletions

View File

@@ -1,4 +1,4 @@
From c08a0854ea28663d5311401118b0ef20e2f1bb0b Mon Sep 17 00:00:00 2001
From 2338e165900308afbfa6299b3a5077fef2e21d6e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6f584d515f..b40bea8e8b 100644
index b066ed57dc..9c3727ecd1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -74,6 +74,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 6f584d515f..b40bea8e8b 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2652,6 +2668,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2656,6 +2672,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {