Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

real 1.18

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-30 16:59:29 -05:00
parent 21dde20b3d
commit 90ae13fa3f
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@@ -1,10 +1,10 @@
group = org.purpurmc.purpur
version = 1.18-rc3-R0.1-SNAPSHOT
version = 1.18-R0.1-SNAPSHOT
mcVersion = 1.18-rc3
mcVersion = 1.18
packageVersion = 1_18_R1
paperCommit = 14b0c80d0d32b8ee59844b6244b37f578699761c
paperCommit = bd9c2b75c75941ae9f54fae5c1dd6a8f5e0e8158
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index cd74406039704e5a880f00b9b60bb7b1dedc5398..66406248e2aa3e422abebfdb4d8f2bdbe0395cfb 100644
index cd74406039704e5a880f00b9b60bb7b1dedc5398..c0051daa10e2d2300f8f1e551554732bdf82fe1e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -15,7 +15,7 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..66406248e2aa3e422abebfdb4d8f2bdb
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ implementation(project(":purpur-api")) // Purpur
+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Purpur
+ implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") // Purpur
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -145,7 +145,7 @@ index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..fd3d3e22613511a42f7fc343079b081c
// Spigot end
DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1d7d3dbf7f6857d9853112844b70692e92e9c89d..77984134e53755caf45b8217a912ef0df645de59 100644
index d938dc26886aa8a64c11db5e49fe5639bc27e1fb..5f9b87bb36a56ea457f7819c1df9c87661f781c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -255,7 +255,7 @@ import javax.annotation.Nullable; // Paper

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

@@ -106,7 +106,7 @@ index c2220d5157d3065a256cd17410760c6aedf24987..729d11569e59e78a0fda67697fe9e27a
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 77984134e53755caf45b8217a912ef0df645de59..272606ec908ef41e24cf8f43e4df05976597930d 100644
index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c5771e5e21d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -933,6 +933,7 @@ public final class CraftServer implements Server {
@@ -133,7 +133,7 @@ index 77984134e53755caf45b8217a912ef0df645de59..272606ec908ef41e24cf8f43e4df0597
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2549,6 +2552,18 @@ public final class CraftServer implements Server {
@@ -2550,6 +2553,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 f944e6beafc7876ed9c6923a22f58d82967b77cb..e1c7b7a659e56fa5b3a1f52cb2ccc99b
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 a59270a4702ae7d567e9c4e425b1793e6d50c4c8..fcfaa50e482ff1a5cc521e68dcfd3631fa87b274 100644
index f4df373b5b7006b476bf0beaf57a3c5771e5e21d..94ab78c63e7b730a9a06eb0b50e80d50df73023c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2718,4 +2718,11 @@ public final class CraftServer implements Server {
@@ -2719,4 +2719,11 @@ public final class CraftServer implements Server {
}
// Paper end

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

@@ -25,10 +25,10 @@ index a6b5a8ff4f72404b69cf08a485632db23967e801..358dcf61cd5f27c77709d175b15e8433
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 372f1603b99e06a26b574454493a0ded7134a7f9..6fd8eae4b5a01545bda4624860112ce8b7ef18b9 100644
index 94ab78c63e7b730a9a06eb0b50e80d50df73023c..a4533e553d199e041014446874a3b5c2f6901431 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2724,5 +2724,10 @@ public final class CraftServer implements Server {
@@ -2725,5 +2725,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 f8668a3664d8feb7cae7c037e0f265253ed76313..bacc37f3478ea45f840fffcb72284c29
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 6fd8eae4b5a01545bda4624860112ce8b7ef18b9..2462f582bc539162e594ac66be1bae83c8436197 100644
index a4533e553d199e041014446874a3b5c2f6901431..55baa26e2938ad8cb04a3b5f468db6ebea28b1ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2506,6 +2506,7 @@ public final class CraftServer implements Server {
@@ -2507,6 +2507,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {