Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8d036cea Expose the internal current tick
0c715390 [PATCH] bounding box check for hanging entities (#2664)
527073aa Update config version
0d3b35c3 Rename baby zombie movement config option
This commit is contained in:
William Blake Galbreath
2019-10-31 13:51:33 -05:00
parent da1de4da09
commit dd928e3864
42 changed files with 114 additions and 199 deletions

View File

@@ -1,4 +1,4 @@
From 197df8b1288d9ab4c40342dd26ac133a8c7f9d72 Mon Sep 17 00:00:00 2001
From 010289186dcb60b25f38edec1f9cd04fa4823b60 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 352e13eef..f87b8c3d5 100644
index 21bc13f79..b6f8942c0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1610,6 +1610,15 @@ public final class Bukkit {
@@ -1614,6 +1614,15 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index 352e13eef..f87b8c3d5 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5337e3c5a..14da18751 100644
index c12e3ba90..ee768158b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1407,5 +1407,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();
@@ -46,5 +46,5 @@ index 5337e3c5a..14da18751 100644
// Purpur end
}
--
2.23.0.rc1
2.24.0.rc1