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 & Tuinity)

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

Paper Changes:
4bcebab1 Add getOfflinePlayerIfCached(String)
67c30690 Fix ghost blocks in ticking view distance
8e6d90c2 [CI-SKIP] Add a GitHub Actions job (#4703)
0ac53efb Avoid crashing clients when fishing loot is empty, Fixes #4235 (#4681)
b64ee74a Fix armor stands still doing entity collision

Tuinity Changes:
576e2cc Rate limit incoming packets
This commit is contained in:
William Blake Galbreath
2020-11-01 15:11:50 -06:00
parent 3fec5dae98
commit 0fa478d031
14 changed files with 416 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ Tuinity config
API to retrieve raw YamlConfiguration + timing exports
diff --git a/pom.xml b/pom.xml
index 29dafd4b..3b5dcb43 100644
index a22e6517d..c4168709b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
@@ -37,10 +37,10 @@ index 29dafd4b..3b5dcb43 100644
<properties>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7c0a7889..740a86a8 100644
index 3e6331807..7a51edbde 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1456,6 +1456,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1475,6 +1475,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 e9fb263b6..dacdcd1f2 100644
index 7a51edbde..49343ce93 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1464,6 +1464,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1483,6 +1483,18 @@ public interface Server extends PluginMessageRecipient {
}
// Tuinity end - add config to timings report

8
patches/api/0009-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 bfe84236..ece4f3de 100644
index 464b2161f..55a0590cc 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1787,4 +1787,15 @@ public final class Bukkit {
@@ -1808,4 +1808,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index bfe84236..ece4f3de 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fdceafc7..6b6f20a1 100644
index 49343ce93..69c1cbdf7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1576,4 +1576,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1595,4 +1595,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
// Paper end

8
patches/api/0012-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 ece4f3de..b4e55c17 100644
index 55a0590cc..39e00f922 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1797,5 +1797,14 @@ public final class Bukkit {
@@ -1818,5 +1818,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index ece4f3de..b4e55c17 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6b6f20a1..70bcd6c3 100644
index 69c1cbdf7..237b00389 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1603,5 +1603,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();