Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@dd216c1 Fix Inconsistencies with Paper Plugin Names (#9098)
PaperMC/Paper@beed22d Undo making JavaPlugin#logger field public (#9125)
PaperMC/Paper@f7717c3 Fix server ignoring fallback for translatable components (#9134)
This commit is contained in:
granny
2023-04-20 19:26:41 -07:00
parent a495371bb7
commit 678eafef72
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ index 66cc44d9f14b01f6c8e53b0f990866ac897c1c81..c38aff50c6f0bc37e539bb4d5206f7b6
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 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556f3934313 100644
index 740bc3aaac6ce4f642e16c339bd7e8de706cbf09..0c2aa1408d8220b9d3369d8b0b39eb5769dd376e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -139,7 +139,7 @@ index 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2749,6 +2752,18 @@ public final class CraftServer implements Server {
@@ -2745,6 +2748,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -159,7 +159,7 @@ index 430df6a2b852f07e3a1cd9dfcd5ecf3e52e63b66..6f59ff3dda4adaa24065ac388c8de556
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 4966a1e3dd35357a8ea6a7d2944c84c9c3e9058e..f5266df43726a7805ee2664ed18a2dcf79ab6cde 100644
index 755c223ab2a046285eb9916b6195093714f4c5ba..5758ce3033c2d4121970eb8757beabc1975c5c83 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -173,6 +173,14 @@ public class Main {