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

last upstream in 1.19.4

Browse Source
This commit is contained in:
NONPLAYT
2023-06-07 23:45:24 +03:00
parent a4fc97c323
commit 38484297f0
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc
version = 1.19.4-R0.1-SNAPSHOT
purpurRef = 561164b800712a7bd02ca0a7069c23bc71677b79
purpurRef = ead09e2bf6dc3d8779f37c13f87e44ce40c89c26
org.gradle.caching = true
org.gradle.parallel = true

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
index d87e4d177b60957eee198c3f1791dbf26dbdddd6..08b912fe3452e9f8ffe3c0c97148d6f4fc8ba8bc 100644
index 96160bced90bb4cd84e48c85c645cad0eb672b85..9094774ed7b9ede35e5fcfeeaf8d7883a80e48a7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1979,6 +1979,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2006,6 +2006,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Purpur end

4
patches/api/0005-Paper-PR-BoneMeal-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR - BoneMeal API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 4561ca02052d774bc1424f7044c34f7affd415fc..7f668a21f3e92d7f98f1bc82d84fdf76be5308f1 100644
index adf8169d5baefa7a33c33ef066180a8116617756..d1071fe098d60ecbdf45bc3f387dab54aaaa8b77 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4112,4 +4112,20 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4121,4 +4121,20 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
}
}
}

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

@@ -139,10 +139,10 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a
.completer(new ConsoleCommandCompleter(this.server))
.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
index 3f80b16c8d69f284a26b16cf2513a955005bf458..6482d743281eddde167a5a1b2f6d680c6d9916ba 100644
index 3310828edcabd2c24e3200dcb89d4e8ebd82cf16..969830ca6ea861d0c140f12547955b93d3bb80cf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -165,10 +165,10 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..627ceea9fa0fccd3e466eb34d59e760b
if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 62ad4c6ad417e11e9152f74636b2ff0d187d0799..0dfd997fea4154896f5a3a04cdfd2d9ab706004f 100644
index be8b44daa0141151c973917a774aa07721647ed1..0b2a5dc43ccba7d223cbdfd3f1dc539a6dab0444 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -227,7 +227,7 @@ public class PurpurConfig {
@@ -229,7 +229,7 @@ public class PurpurConfig {
deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
}

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

@@ -376,7 +376,7 @@ index b8001bca2a33ec1e60566948a651400418a6e9e7..e39b3c7a67de82dd5165f9276f374cd8
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 6482d743281eddde167a5a1b2f6d680c6d9916ba..0c6c9a67d3868acff4d90cec4bd67bf733554efc 100644
index 969830ca6ea861d0c140f12547955b93d3bb80cf..9ebd11d10f66e4b7423fd77e47dd6d53667a84df 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -15,6 +15,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -387,7 +387,7 @@ index 6482d743281eddde167a5a1b2f6d680c6d9916ba..0c6c9a67d3868acff4d90cec4bd67bf7
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
@@ -974,6 +975,7 @@ public final class CraftServer implements Server {
@@ -994,6 +995,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
@@ -395,7 +395,7 @@ index 6482d743281eddde167a5a1b2f6d680c6d9916ba..0c6c9a67d3868acff4d90cec4bd67bf7
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))
@@ -990,6 +992,7 @@ public final class CraftServer implements Server {
@@ -1010,6 +1012,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.purpurConfig.init(); // Purpur
@@ -403,7 +403,7 @@ index 6482d743281eddde167a5a1b2f6d680c6d9916ba..0c6c9a67d3868acff4d90cec4bd67bf7
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1006,6 +1009,7 @@ public final class CraftServer implements Server {
@@ -1026,6 +1029,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
@@ -411,7 +411,7 @@ index 6482d743281eddde167a5a1b2f6d680c6d9916ba..0c6c9a67d3868acff4d90cec4bd67bf7
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2827,6 +2831,13 @@ public final class CraftServer implements Server {
@@ -2847,6 +2851,13 @@ public final class CraftServer implements Server {
}
// Purpur end
@@ -426,7 +426,7 @@ index 6482d743281eddde167a5a1b2f6d680c6d9916ba..0c6c9a67d3868acff4d90cec4bd67bf7
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 2a8db3527f3680789125fca41097657063efb32d..8038bfada0cbab20d22e3305029ba32011665d22 100644
index 288cf98287c6d3c073b9ab6696c3957c999cad32..8d955cd5be21ed218b1e219fefd383de7704bd2c 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -187,6 +187,14 @@ public class Main {

6
patches/server/0005-Add-missing-purpur-config-options.patch
View File

@@ -199,10 +199,10 @@ index 3a720375c3daa961a34363f78c2c51d301c3fa06..cf5203fb60b7cc27da3a7607abe571b7
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 0dfd997fea4154896f5a3a04cdfd2d9ab706004f..22249e4dc391d1c7a3d124ec07f39f149fb7de0f 100644
index 0b2a5dc43ccba7d223cbdfd3f1dc539a6dab0444..01e10034ad8cd91d30c4c3dc7b372617ad6b785e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -324,6 +324,7 @@ public class PurpurConfig {
@@ -326,6 +326,7 @@ public class PurpurConfig {
}
public static int barrelRows = 3;
@@ -210,7 +210,7 @@ index 0dfd997fea4154896f5a3a04cdfd2d9ab706004f..22249e4dc391d1c7a3d124ec07f39f14
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
@@ -364,6 +365,7 @@ public class PurpurConfig {
@@ -366,6 +367,7 @@ public class PurpurConfig {
case 1 -> 9;
default -> 27;
});

4
patches/server/0008-Fix-entity-serialization.patch
View File

@@ -25,10 +25,10 @@ index e71eca3ddbbeb3168dd73433b6d6ffe9f6755f77..a5b7194823027446117b14fbf916f2cb
return this.isPassenger() ? false : this.saveAsPassenger(nbt);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 1dd7f923dd6adb41eafc3ea0c063e3aae6670124..df970a68c9139025caca056d7941d01224126a5c 100644
index 1bf9a11abf7884a421374cbca5ccc18480717b79..32bc9099fea1fed7c94bff27cb897cdb4aab9e73 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -490,8 +490,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -498,8 +498,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
Preconditions.checkNotNull(entity, "null cannot be serialized");
Preconditions.checkArgument(entity instanceof org.bukkit.craftbukkit.entity.CraftEntity, "only CraftEntities can be serialized");

4
patches/server/0014-Paper-PR-BoneMeal-API.patch
View File

@@ -38,10 +38,10 @@ index c26665bc59c18c4da467fb6ae33e51a65ecf1de6..bf65490f0239fc6d9d9c101ebce5845d
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 39a2ff8c34f995ab860aadc24d24136d602af646..361d21078557dab4edee17e519852d8952f320ee 100644
index 68df53648c9b76cf1b6abcaa90c5e8938e9e0d05..ad76c55fbd5ed4d3cfd0c30875547bebd1bac406 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2465,5 +2465,43 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2472,5 +2472,43 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return this.adventure$pointers;
}