From fee61cf0cc9c0d0e2a468199208849469b3192d9 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 23 Jan 2026 09:39:04 +0100 Subject: [PATCH] call ConfigurationLoadEvent after the configuration is loaded on start (#2897) * call ConfigurationLoadEvent after the configuration is loaded on server start * call ConfigurationLoadEvent on all platforms --- .../main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java | 2 ++ .../src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java | 2 ++ .../main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java | 2 ++ .../java/com/sk89q/worldedit/neoforge/NeoForgeWorldEdit.java | 2 ++ .../main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java | 2 ++ 5 files changed, 10 insertions(+) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java index c24bb15f14..f90a4b7352 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java @@ -33,6 +33,7 @@ import com.sk89q.worldedit.bukkit.adapter.BukkitImplLoader; import com.sk89q.worldedit.event.platform.CommandEvent; import com.sk89q.worldedit.event.platform.CommandSuggestionEvent; +import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlatformUnreadyEvent; import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent; @@ -183,6 +184,7 @@ private void setupPreWorldData() { loadAdapter(); initializeRegistries(); // this creates the objects matching Bukkit's enums - but doesn't fill them with data yet config.load(); + WorldEdit.getInstance().getEventBus().post(new ConfigurationLoadEvent(config)); } private void setupWorldData() { diff --git a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java index 7aa1546f19..b561d1c63d 100644 --- a/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java +++ b/worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java @@ -25,6 +25,7 @@ import com.sk89q.worldedit.cli.data.FileRegistries; import com.sk89q.worldedit.cli.schematic.ClipboardWorld; import com.sk89q.worldedit.event.platform.CommandEvent; +import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent; import com.sk89q.worldedit.extension.input.InputParseException; @@ -204,6 +205,7 @@ public void onStarted() { setupRegistries(); config.load(); + WorldEdit.getInstance().getEventBus().post(new ConfigurationLoadEvent(config)); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform)); } diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java index 401bc6e9bd..ab19e315de 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricWorldEdit.java @@ -23,6 +23,7 @@ import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.command.util.PermissionCondition; +import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlatformUnreadyEvent; import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent; @@ -336,6 +337,7 @@ private void onStartServer(MinecraftServer minecraftServer) { setupRegistries(minecraftServer); config.load(); + WorldEdit.getInstance().getEventBus().post(new ConfigurationLoadEvent(config)); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform)); } diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorldEdit.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorldEdit.java index ac3c8373fd..87cbda4a76 100644 --- a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorldEdit.java +++ b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeWorldEdit.java @@ -24,6 +24,7 @@ import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.command.util.PermissionCondition; +import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlatformUnreadyEvent; import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent; @@ -296,6 +297,7 @@ public void serverStarted(ServerStartedEvent event) { setupRegistries(event.getServer()); config.load(); + WorldEdit.getInstance().getEventBus().post(new ConfigurationLoadEvent(config)); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform)); } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java index ecc6506007..fab6a0210e 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java @@ -25,6 +25,7 @@ import com.sk89q.worldedit.command.util.PermissionCondition; import com.sk89q.worldedit.event.platform.CommandEvent; import com.sk89q.worldedit.event.platform.CommandSuggestionEvent; +import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlatformUnreadyEvent; import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent; @@ -245,6 +246,7 @@ public void serverStarted(StartedEngineEvent event) { Registries.get(""); config.load(); + WorldEdit.getInstance().getEventBus().post(new ConfigurationLoadEvent(config)); WorldEdit.getInstance().getEventBus().post(new PlatformReadyEvent(platform)); }