Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +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:
b8372fc0 Improve handling of indestructable blocks
a2a06640 Add moon phase API
47f71aea Fix SpawnChangeEvent not firing for all use-cases
b6c860f2 Don't require FACING data
0c1716a1 Add #setMaxPlayers API
02aed275 [CI-SKIP] Require dependencies script (#4172)
1ccc1c67 Add smithing item helpers
20d9ec6b Fix MC-197271
e9287056 [CI-SKIP] Update issue templates with notices
This commit is contained in:
William Blake Galbreath
2020-08-23 16:09:37 -05:00
parent d394fce3e9
commit 949a9956ab
16 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -37,10 +37,10 @@ index 1a34f6880..95a99b7b5 100644
<properties>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6e01bf2d5..46c4d98ce 100644
index bacb3ee9a..e9fb263b6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1447,6 +1447,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1456,6 +1456,14 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end

4
patches/api/0003-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 46c4d98ce..49dd5974d 100644
index e9fb263b6..dacdcd1f2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1455,6 +1455,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1464,6 +1464,18 @@ public interface Server extends PluginMessageRecipient {
}
// Tuinity end - add config to timings report

8
patches/api/0010-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 62cc1c74c..9abb3ba7f 100644
index 7fd924621..f19d865dd 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1776,4 +1776,15 @@ public final class Bukkit {
@@ -1787,4 +1787,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 62cc1c74c..9abb3ba7f 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 49dd5974d..1f44ee201 100644
index dacdcd1f2..ad45e2a4c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1567,4 +1567,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1576,4 +1576,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
// Paper end

4
patches/api/0013-MoonPhase-API.patch
View File

@@ -47,10 +47,10 @@ index 000000000..f5ad98c62
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ba5e6cca0..e764f1b1c 100644
index e827e1a6f..2685dfa18 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3460,6 +3460,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3466,6 +3466,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

8
patches/api/0014-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 9abb3ba7f..60746ff04 100644
index f19d865dd..36bb9d37e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1786,5 +1786,14 @@ public final class Bukkit {
@@ -1797,5 +1797,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 9abb3ba7f..60746ff04 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1f44ee201..1b743968b 100644
index ad45e2a4c..5b04a7699 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1575,5 +1575,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();