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

Updated Upstream (Paper)

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

Paper Changes:
3aae7ef Updated Upstream (Bukkit/CraftBukkit)
4713937 Fix return value of Block#applyBoneMeal always being false (#6030)
This commit is contained in:
William Blake Galbreath
2021-06-28 22:07:35 -05:00
parent 76845665e6
commit cd5f184f6d
12 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0013-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98..047b6b3d037ccdc9c83d8f46d5469884f4811717 100644
index 93daff9e8a75c2019a907577841f6eeddaabb5e1..bf86f402bc099ee190c809220f211ed59b3e9613 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1992,5 +1992,14 @@ public final class Bukkit {
@@ -2016,5 +2016,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index d6fe8f2bd2e648b54f0ca6f5d49587d2008eaf98..047b6b3d037ccdc9c83d8f46d5469884
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index eebaee3f3e01f39c0378cc89381eb97d95f31152..f24d00951cd6951023f1ff34312ae0438107fc22 100644
index f8ee62ed450f52bc3a321ff75a36b9778f0f91b5..bab0c0d660a01e912d0a88aefbacf20895f4ef61 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1744,5 +1744,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1764,5 +1764,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();