Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +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:
6e7dc3f81 [Auto] Updated Upstream (CraftBukkit)
664ae4554 [Auto] Updated Upstream (CraftBukkit)
dafc7b8f8 Fix off by one error for scheduling block ticks (#4014)
5791e512b Fix MaterialTags tests to actually pass
115972651 Expand MaterialTags v2 (#4009)
5aaf1c514 prevent path space splitting in testServer.sh (#4007)
a8ef09b82 Tighten logic for handling target tick times in tick scheduler (#4010)
d5ccd4139 Remove ability to disable async chunks unless single core cpu
76728529f Fix Light Prioritization Issues
2d66b5be8 [Auto] Updated Upstream (CraftBukkit)
51d10c201 Add missing strikeLighting call to World#spigot()#strikeLightningEffect

Tuinity Changes:
416ed5e Fix 3 tick pistons not functioning correctly
489faf0 Fix up lock handling for UserCache
This commit is contained in:
William Blake Galbreath
2020-07-28 12:51:43 -05:00
parent 331571119c
commit fe05292d11
9 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0002-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/pom.xml b/pom.xml
index 6fd596817..5b540e606 100644
index 6fd5968178..5b540e606e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,11 @@
@@ -86,7 +86,7 @@ index 6fd596817..5b540e606 100644
</configuration>
<executions>
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index 74ed02fa9..c1280478e 100644
index 74ed02fa92..c1280478ee 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -99,7 +99,7 @@ index 74ed02fa9..c1280478e 100644
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0200f21cb..56020d44b 100644
index 0200f21cbe..56020d44b7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1505,7 +1505,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -113,7 +113,7 @@ index 0200f21cb..56020d44b 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
new file mode 100644
index 000000000..d8b408f06
index 0000000000..d8b408f061
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
@@ -0,0 +1,115 @@
@@ -233,7 +233,7 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d434bd93b..7079c79f7 100644
index d434bd93bc..7079c79f7b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@@ -246,10 +246,10 @@ index d434bd93b..7079c79f7 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index f1e60981a..1fe87d763 100644
index 90c1067ca2..dd2772d8c7 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -323,7 +323,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
@@ -259,7 +259,7 @@ index f1e60981a..1fe87d763 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 001b1e519..13b984393 100644
index 001b1e5197..13b9843932 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {