Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
PaperMC/Paper@a36d7f6 Updated Upstream (CraftBukkit)
PaperMC/Paper@7b9c30f Fix scoreboard objective name length limit
This commit is contained in:
BillyGalbreath
2022-03-06 09:36:55 -06:00
parent 3e8b148a1f
commit f5725829d1
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.18.2-R0.1-SNAPSHOT
paperCommit = 1e12cf8db62dde92a4bc79300ef32e0fdc6e50a8
paperCommit = 7b9c30fb82d79599878543d7877f686678db0792
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0003-Purpur-config-files.patch
View File

@@ -84,7 +84,7 @@ index 1ea4178976e1583b6b0f71b26d00c024bc2ef49c..0df8172bc3a5621c2d23b036ce2e5879
io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index d1521394eaf38ab4e3ee55452149458911a3030b..5c69a8914ce87f1a19c4a86c7d7a8a15df78a270 100644
index 8026e8ca528071bf80fecb5e96370d1d2ae799db..f16e21045f3a6b8c0446c72825b463ee4dc1c24a 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -164,6 +164,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -105,7 +105,7 @@ index d1521394eaf38ab4e3ee55452149458911a3030b..5c69a8914ce87f1a19c4a86c7d7a8a15
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4bc37e48600d830a9cdc379428fcd82c9d9639d4..0b5a4e0d805558329fd95d8729690e05ee0db9b9 100644
index 5db94729b74419054264f0cbb4e1a7ddf455f0b7..ce07e8cd0a767a97850380c5e015108f0f1a238b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -955,6 +955,7 @@ public final class CraftServer implements Server {
@@ -132,7 +132,7 @@ index 4bc37e48600d830a9cdc379428fcd82c9d9639d4..0b5a4e0d805558329fd95d8729690e05
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2679,6 +2682,18 @@ public final class CraftServer implements Server {
@@ -2699,6 +2702,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

4
patches/server/0012-Bring-back-server-name.patch
View File

@@ -17,10 +17,10 @@ index ebfaa8d5de5b905bd2dd7778728b8c9939d01252..8153f1aa510474d2f831799a1c149558
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0b5a4e0d805558329fd95d8729690e05ee0db9b9..36776ee4e143b1198a88bf08fd4ba2d2116fe1d1 100644
index ce07e8cd0a767a97850380c5e015108f0f1a238b..be20f1450f1b562e4b2112ee16a952313da3b009 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2853,4 +2853,11 @@ public final class CraftServer implements Server {
@@ -2873,4 +2873,11 @@ public final class CraftServer implements Server {
}
// Paper end

4
patches/server/0015-Lagging-threshold.patch
View File

@@ -25,10 +25,10 @@ index c9e6334ad389aea328ffbc7ec1cc460b28f47995..0511e63ed1af2348f6fb4d7c7cede247
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index be5dd98b305fb83cbb344f80c045720c3cb900cf..571cbb2a811c2ce7459db48a1d648e86fd0448d3 100644
index be20f1450f1b562e4b2112ee16a952313da3b009..a5807506dede68d948b4536d01d64391188b9797 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2859,5 +2859,10 @@ public final class CraftServer implements Server {
@@ -2879,5 +2879,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

4
patches/server/0066-Add-5-second-tps-average-in-tps.patch
View File

@@ -69,10 +69,10 @@ index 4d7fe9b259fb765944d675cce20dffdfb13acd63..81b8b8b597f6b33e011d708fe8e70b7a
lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 571cbb2a811c2ce7459db48a1d648e86fd0448d3..5fa7f70be550cb6d314b713263886c5dd59f7917 100644
index a5807506dede68d948b4536d01d64391188b9797..b3fb17f2f9bb50612a0f6a354e8412422f37ee95 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2636,6 +2636,7 @@ public final class CraftServer implements Server {
@@ -2656,6 +2656,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {