Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@86a6543 Updated Upstream (Paper)
PurpurMC/Purpur@2e39567 Re-add missing chunk api calls, fixes #1560
PurpurMC/Purpur@eadfff7 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-07-18 23:26:42 +03:00
parent 451eb3ec0b
commit e1d2ae3390
11 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0002-Divine-Configuration.patch
View File

@@ -34,7 +34,7 @@ index 39a7abeeff53a608774dc34226e9b5e12bd5b5d2..6833a7710cfb2716c8522d8a841bee66
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index ba2254ef7688177eff2ed8115726b7b551620560..27a52e96f5bc97c1e1aceb88088595db93a35b20 100644
index ed313b0424b2e1e1335ee3e3bd4d9cfd15f24b39..4d2e285657ad2c060c384e1e4027e00d9cf25346 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -83,6 +83,7 @@ import net.minecraft.world.phys.AABB;
@@ -62,7 +62,7 @@ index ba2254ef7688177eff2ed8115726b7b551620560..27a52e96f5bc97c1e1aceb88088595db
this.generator = gen;
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 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff179bf2ece 100644
index 2e440d3c0b4bd42d6bc8409778473f574e22c54b..7257d1052746d90662bb2a796b2f437fc0a2e9ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,6 +265,8 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -74,7 +74,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
public final class CraftServer implements Server {
private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
private final String serverVersion;
@@ -1074,6 +1076,7 @@ public final class CraftServer implements Server {
@@ -1083,6 +1085,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -82,7 +82,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
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))
@@ -1090,6 +1093,7 @@ public final class CraftServer implements Server {
@@ -1099,6 +1102,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.purpurConfig.init(); // Purpur
@@ -90,7 +90,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1107,6 +1111,7 @@ public final class CraftServer implements Server {
@@ -1116,6 +1120,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
@@ -98,7 +98,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3056,6 +3061,13 @@ public final class CraftServer implements Server {
@@ -3065,6 +3070,13 @@ public final class CraftServer implements Server {
}
// Purpur end
@@ -113,7 +113,7 @@ index 002a3ee08d7e009ef1e4bd3bc274aa608846b219..7c6af53de9b3b7552bf69aaef6ce2ff1
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 f0e7f729e58fa1b297ae07edcf808f6211262189..33a5a64b1dfea4d284f45fd80867144d3cdec501 100644
index 577b2f19e625ca71b13477eb96e42e04954fa449..52fb3f237a986b79339e2e1142d33a8d5291bdce 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -184,6 +184,14 @@ public class Main {