Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
6ecbe5776 Rename leftover resource->datapack (#5662)
ec90a7859 I give up on trying to teach people to avoid the incorrect ways.
This commit is contained in:
BillyGalbreath
2021-05-17 02:08:40 -05:00
parent 7bfc70d951
commit 5f87a45950
15 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -20718,7 +20718,7 @@ index e50731723d266ba65b2163df2e935afb8b013a93..a6736d15282715d920bab85eb92074cd
}
value.append("},");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 554d13d65952af1b98db074ebc4a2d90474029f6..1d07fa90736b0c4995b5d7dc0cafe9303fa30c84 100644
index edeb3e542c2e32379a5fb4229b389ad4a4987dbb..5178a8b65c18bf099cad544ea7088d2eb6e1985d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -233,7 +233,7 @@ import javax.annotation.Nullable; // Paper
@@ -20937,7 +20937,7 @@ index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..02807cc1fe14e747a7c18edf0fcdc386
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 6cae7454f3cf5b246300bac489b38ea65e2185c9..969beec6ceaf43282337cf02af94033764c95bcc 100644
index 68229f7679f9e974dc7af6c34d6f1d3f8db49353..86c7b5de4cc9f02365f0986a0e9b381f5edf395b 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -146,6 +146,13 @@ public class Main {