From bc31c28c97a82e0d2a652c04ee5d224f34ab0517 Mon Sep 17 00:00:00 2001 From: Nico Sendan <76180677+YoshiroMaximus@users.noreply.github.com> Date: Mon, 12 Oct 2026 18:38:00 -0700 Subject: [PATCH 1/2] fixed /spawn command fixed it from not working after using the /setspawn command --- .../com/eternalcode/core/feature/spawn/SetSpawnCommand.java | 2 -- .../com/eternalcode/core/feature/spawn/SpawnServiceImpl.java | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java index 0162a01a3..f48b9aca0 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java @@ -3,7 +3,6 @@ import com.eternalcode.annotations.scan.command.DescriptionDocs; import com.eternalcode.core.injector.annotations.Inject; import com.eternalcode.core.notice.NoticeService; -import dev.rollczi.litecommands.annotations.async.Async; import dev.rollczi.litecommands.annotations.command.Command; import dev.rollczi.litecommands.annotations.context.Sender; import dev.rollczi.litecommands.annotations.execute.Execute; @@ -26,7 +25,6 @@ class SetSpawnCommand { this.spawnService = spawnService; } - @Async @Execute @DescriptionDocs(description = "Set spawn location") void execute(@Sender Player player) { diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnServiceImpl.java index e6b48b95d..8d1987289 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnServiceImpl.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnServiceImpl.java @@ -54,6 +54,7 @@ public Location getSpawnLocation() { } private boolean isSpawnValid() { - return !this.locationsConfiguration.spawn.isNoneWorld(); + return this.locationsConfiguration.spawn != null + && !this.locationsConfiguration.spawn.isNoneWorld(); } } From 58e2baa96cef7304e0ee392dfe6115a4ba8ded6f Mon Sep 17 00:00:00 2001 From: Nico Sendan <76180677+YoshiroMaximus@users.noreply.github.com> Date: Mon, 12 Oct 2026 18:41:40 -0700 Subject: [PATCH 2/2] fixed other async commands handlers run on the normal command thread now. --- .../main/java/com/eternalcode/core/EternalCoreCommand.java | 2 -- .../java/com/eternalcode/core/feature/jail/JailCommand.java | 4 ---- .../com/eternalcode/core/feature/setslot/SetSlotCommand.java | 2 -- 3 files changed, 8 deletions(-) diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java index 982411126..b023abba3 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java @@ -6,7 +6,6 @@ import com.eternalcode.core.publish.Publisher; import com.eternalcode.core.publish.event.EternalReloadEvent; import com.google.common.base.Stopwatch; -import dev.rollczi.litecommands.annotations.async.Async; import dev.rollczi.litecommands.annotations.command.Command; import dev.rollczi.litecommands.annotations.context.Sender; import dev.rollczi.litecommands.annotations.execute.Execute; @@ -34,7 +33,6 @@ class EternalCoreCommand { this.publisher = publisher; } - @Async @Execute(name = "reload") @DescriptionDocs(description = "Reloads EternalCore configuration") void reload(@Sender Audience audience) { diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java index c46e24605..63b84d166 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java @@ -6,7 +6,6 @@ import com.eternalcode.core.notice.NoticeService; import com.eternalcode.core.util.DurationUtil; import dev.rollczi.litecommands.annotations.argument.Arg; -import dev.rollczi.litecommands.annotations.async.Async; import dev.rollczi.litecommands.annotations.command.Command; import dev.rollczi.litecommands.annotations.context.Sender; import dev.rollczi.litecommands.annotations.execute.Execute; @@ -39,7 +38,6 @@ class JailCommand { this.server = server; } - @Async @Execute(name = "setup") @Permission("eternalcore.jail.setup") @DescriptionDocs(description = "Define jail spawn area") @@ -57,7 +55,6 @@ void executeJailSetup(@Sender Player player) { .send(); } - @Async @Execute(name = "setup") @Permission("eternalcore.jail.setup") @DescriptionDocs(description = "Define jail spawn area", arguments = "") @@ -75,7 +72,6 @@ void executeJailSetup(@Sender Player player, @Arg Location location) { .send(); } - @Async @Execute(name = "remove") @Permission("eternalcore.jail.setup") @DescriptionDocs(description = "Remove jail spawn area") diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java index 4ec126559..ec8b70b4f 100644 --- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java +++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java @@ -5,7 +5,6 @@ import com.eternalcode.core.notice.NoticeService; import com.eternalcode.core.viewer.Viewer; import dev.rollczi.litecommands.annotations.argument.Arg; -import dev.rollczi.litecommands.annotations.async.Async; import dev.rollczi.litecommands.annotations.command.Command; import dev.rollczi.litecommands.annotations.context.Sender; import dev.rollczi.litecommands.annotations.execute.Execute; @@ -28,7 +27,6 @@ public SetSlotCommand( } @Execute - @Async @DescriptionDocs(description = "Set the max players on the server") public void execute(@Sender Viewer viewer, @Arg int slots) { if (slots <= 0) {