diff --git a/gradle.properties b/gradle.properties index 46b9d06..6a7437b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = one.tranic.bukkit version = 1.21-R0.1-SNAPSHOT -luminolCommit = 14de6bf8c791512d426905ea5ea42a9abb924724 +luminolCommit = 1ed71f5812cf8ef57bf713fc5c6d8f90379a3146 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0003-LevelBukkit-Config.patch b/patches/server/0003-LevelBukkit-Config.patch index 94f5632..34fdb95 100644 --- a/patches/server/0003-LevelBukkit-Config.patch +++ b/patches/server/0003-LevelBukkit-Config.patch @@ -26,23 +26,15 @@ index 581bd217304e0f9e0b2113c335694805dfb4e2a1..06923ba8a103af605fca2797c17cdf19 Bootstrap.bootStrap(); Bootstrap.validate(); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 79b79a5d41dc3568ae6a3d7701e6ac6b91045e36..d6d95abc0374185df20b6b8e450b5ac415879b22 100644 +index cd28f741343c443ff4728fc0aa5526b6d66d2d9b..285c1a983fa51265a28b539856c6381e3b813375 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -57,6 +57,7 @@ import net.minecraft.world.level.GameRules; - import net.minecraft.world.level.GameType; - import net.minecraft.world.level.block.entity.SkullBlockEntity; - import net.minecraft.world.level.storage.LevelStorageSource; -+import one.tranic.bukkit.config.LevelBukkitConfig; - import org.slf4j.Logger; - - // CraftBukkit start -@@ -228,6 +229,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -228,6 +228,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface // Paper end - initialize global and world-defaults configuration me.earthme.luminol.config.LuminolConfig.loadConfig(); //Luminol - load config file me.earthme.luminol.config.LuminolConfig.setupLatch(); //Luminol - load config file -+ LevelBukkitConfig.setCommand(); // LevelBukkit - setup commands - this.server.spark.enableEarlyIfRequested(); // Paper - spark ++ one.tranic.bukkit.config.LevelBukkitConfig.setCommand(); // LevelBukkit - setup commands + if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark // Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save if (this.convertOldUsers()) { diff --git a/src/main/kotlin/one/tranic/bukkit/commands/ConfigCommand.kt b/src/main/kotlin/one/tranic/bukkit/commands/ConfigCommand.kt