Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00
Code Issues Releases Activity

patches fixup

Browse Source
This commit is contained in:
NONPLAYT
2023-12-19 15:42:59 +03:00
parent 010da38c53
commit 5e5d8a0802
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/automatic-update.yml vendored
View File

@@ -39,8 +39,8 @@ jobs:
cd DivineMC cd DivineMC
if ! git diff --quiet; then if ! git diff --quiet; then
git add gradle.properties git add gradle.properties
git config user.name "HaHaWTH" git config user.name "Github Actions"
git config user.email HaHaWTH@users.noreply.github.com git config user.email no-reply@github.com
git commit -m "Updated Upstream (Purpur)" git commit -m "Updated Upstream (Purpur)"
git push git push
else else

4
patches/api/0001-Divine-Configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Divine Configuration
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7eae8683c0d540ba049dddaed8737e051d6f60db..0d6de2768b6f6b072b9790c5faf70b023fda7c0d 100644 index 529fb1beadefc79ce6bf5755d5223301b9933152..29a8f52d648b878e0f06176a20de5168f87d9897 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -2202,6 +2202,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -2210,6 +2210,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
} }
// Purpur end // Purpur end

8
patches/server/0001-Divine-Branding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index fb1837bd5d0cb1970a6c236e72654a1c09502c48..8370eebc87f16568c933e9ad93f999542fd1dafd 100644 index d7951a9b3819ddc1d42e10d40bdf57ae47666d89..170fc1ba1639dc2bc8e85416732cb81f6c0c820c 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -28,7 +28,7 @@ repositories { @@ -28,7 +28,7 @@ repositories {
@@ -138,10 +138,10 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a
.completer(new ConsoleCommandCompleter(this.server)) .completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true); .option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1677e737daa272d7669777a75214170a8e9c7d74..06d69272239161363c2d45638920eda541748ca8 100644 index 796787b28babc5393cfb8f83cb9e77a5cb6114f2..181e8cc59984603784917463037a8c633e2027e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper @@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server { public final class CraftServer implements Server {
@@ -164,7 +164,7 @@ index fb87620c742ff7912f5e8ccd2a7930dd605576d9..909a4b84d1cfa4a42a28af97be16572b
if (stream != null) { if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3633574e112f217b412217dd243a631dc4e9c40c..1f54e2ec6d73853001642bcf4b355c4a0dd10f6d 100644 index e9fc2b4661f5275b93db5d3fdf25a8bdc3b38920..e14a5be13af47162c3f03f7d75ecbe10799bc907 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -231,7 +231,7 @@ public class PurpurConfig { @@ -231,7 +231,7 @@ public class PurpurConfig {

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

@@ -377,18 +377,18 @@ index 8e411a60cdd39ba1a365b29a6dbbb468a8ef6736..f96f6b817c9afd05269503e8a4a34ae0
this.generator = gen; this.generator = gen;
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 06d69272239161363c2d45638920eda541748ca8..6f7f4642223f75063e96c4d3c6e251509ee6a162 100644 index 181e8cc59984603784917463037a8c633e2027e3..84bd440194969cae24ccef2a0813bd0f4e85d04d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -16,6 +16,7 @@ import com.mojang.datafixers.util.Pair; @@ -14,6 +14,7 @@ import com.mojang.brigadier.tree.CommandNode;
import com.mojang.brigadier.tree.LiteralCommandNode;
import com.mojang.serialization.Dynamic; import com.mojang.serialization.Dynamic;
import com.mojang.serialization.DynamicOps;
import com.mojang.serialization.Lifecycle; import com.mojang.serialization.Lifecycle;
+import gq.bxteam.divinemc.configuration.DivineConfig; +import gq.bxteam.divinemc.configuration.DivineConfig;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@@ -1051,6 +1052,7 @@ public final class CraftServer implements Server { @@ -1052,6 +1053,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console); this.console.paperConfigurations.reloadConfigs(this.console);
org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -396,7 +396,7 @@ index 06d69272239161363c2d45638920eda541748ca8..6f7f4642223f75063e96c4d3c6e25150
for (ServerLevel world : this.console.getAllLevels()) { for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty // 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)) world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -1067,6 +1069,7 @@ public final class CraftServer implements Server { @@ -1068,6 +1070,7 @@ public final class CraftServer implements Server {
} }
world.spigotConfig.init(); // Spigot world.spigotConfig.init(); // Spigot
world.purpurConfig.init(); // Purpur world.purpurConfig.init(); // Purpur
@@ -404,7 +404,7 @@ index 06d69272239161363c2d45638920eda541748ca8..6f7f4642223f75063e96c4d3c6e25150
} }
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1083,6 +1086,7 @@ public final class CraftServer implements Server { @@ -1084,6 +1087,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.registerCommands(); // Spigot org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
@@ -412,7 +412,7 @@ index 06d69272239161363c2d45638920eda541748ca8..6f7f4642223f75063e96c4d3c6e25150
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -3089,6 +3093,13 @@ public final class CraftServer implements Server { @@ -3090,6 +3094,13 @@ public final class CraftServer implements Server {
} }
// Purpur end // Purpur end
@@ -427,7 +427,7 @@ index 06d69272239161363c2d45638920eda541748ca8..6f7f4642223f75063e96c4d3c6e25150
public void restart() { public void restart() {
org.spigotmc.RestartCommand.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 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index f93c8a4ca38e7d892b6941d3669445789c2fc227..fb42936e42293a4bdd4447a86d0f85027f2026e6 100644 index cce747b8a2d87d81429dfaf1e0073b1ea4b1a5d2..52c1280a6eae4f71dfe3f6c0657399caf35a8831 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -182,6 +182,14 @@ public class Main { @@ -182,6 +182,14 @@ public class Main {