mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-23 16:59:24 +00:00
Updated Upstream (Purpur)
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@c5c7609 Updated Upstream (Paper)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
group = gq.bxteam.divinemc
|
||||
|
||||
version = 1.20.1-R0.1-SNAPSHOT
|
||||
purpurRef = aeecb71060e0ef279209ac7e14620cab6189c452
|
||||
purpurRef = c5c7609d0bd70e1787887a3249aefbfbc52611df
|
||||
|
||||
org.gradle.caching = true
|
||||
org.gradle.parallel = true
|
||||
|
||||
@@ -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 615c47f069d429e14993c60253f719b514849a67..f2a0723eaaddc572f713f4cbad0092e2382123b3 100644
|
||||
index aaef58468a3c31f35e5067ed4263e9dd3fbddddd..36979d745b7a19b01116a1b4a3e621a8745c7f8b 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -2093,6 +2093,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
@@ -2133,6 +2133,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
||||
}
|
||||
// Purpur end
|
||||
|
||||
|
||||
@@ -377,7 +377,7 @@ index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..0eb08e6fe7079f2e76bc76d503395971
|
||||
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 0d7f16c2a789fa63ebb8f02c8f653e68cf73d3cb..dd8cd38517a590fe34bdab378a5fbcde949006ff 100644
|
||||
index 7921caca236900b9d1d234d95db5a24cc403d9b2..a8aed082ea5b10792380dc36d9920409edb5dfce 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;
|
||||
@@ -412,7 +412,7 @@ index 0d7f16c2a789fa63ebb8f02c8f653e68cf73d3cb..dd8cd38517a590fe34bdab378a5fbcde
|
||||
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||
|
||||
@@ -2986,6 +2990,13 @@ public final class CraftServer implements Server {
|
||||
@@ -3016,6 +3020,13 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
// Purpur end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user