Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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@27516ee Temp fix for EntityType.translationKey
PaperMC/Paper@8fced9d [ci skip] Update paperweight to 1.5.1 (#8856)
PaperMC/Paper@f9dc371 Fix calling UnknownCommandEvent (#8232)
This commit is contained in:
granny
2023-02-17 03:20:27 -08:00
parent fccccfa194
commit 41593baf70
19 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ index 061716934ba0a1f01e4d85d664034f72b3c7a765..9713263c3bd34ab8a3bfc0a8797ba0b1
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
index ae5dd08de75a7ed231295f306fd0974da3988249..b8d49f7607c646216d42f4e047997d47b49f228f 100644
index 7b6b51392b123d34382233adcf4c3d4867bdaa32..ccc78857b51e25640ec1e4dcfe4c76a06d1bbff4 100644
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
@@ -317,6 +317,30 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
@@ -105,10 +105,10 @@ index 42299fd6ae663b01bb5f010b96887caa744dcb96..816f906f98adc180f37d2b216628e576
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 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b82b4c2c1d 100644
index 0c75b7f595dc14c02f6384f786a3943f4e16bcef..0fcc3685f3f5b5c81a85f6981541f2cecc386da3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -980,6 +980,7 @@ public final class CraftServer implements Server {
@@ -981,6 +981,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -116,7 +116,7 @@ index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b8
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -995,6 +996,7 @@ public final class CraftServer implements Server {
@@ -996,6 +997,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@@ -124,7 +124,7 @@ index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b8
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1010,6 +1012,7 @@ public final class CraftServer implements Server {
@@ -1011,6 +1013,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -132,7 +132,7 @@ index 22c9cbb8f0d43650a8d021fac8b9efae4478c9e6..37b4f6ec19ef2c847214e127c258e1b8
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2769,6 +2772,18 @@ public final class CraftServer implements Server {
@@ -2770,6 +2773,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}