Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-10 19:30:18 -05:00
parent a9305232b2
commit f2e328d295
53 changed files with 486 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0015-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From e87e36de2b313502386d54bcae4f7c531f1c183b Mon Sep 17 00:00:00 2001
From 2ca955541330acf8eef7244843b91694407e881b 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 a2cf8e29b..220cc96c0 100644
index abf7caf0..c9fc59a2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1631,6 +1631,15 @@ public final class Bukkit {
@@ -1675,6 +1675,15 @@ public final class Bukkit {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index a2cf8e29b..220cc96c0 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 89100f3f5..ee0f2d6b2 100644
index 39d933aa..eba6a7a7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1439,6 +1439,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1479,6 +1479,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
String getServerName();