diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/WoolHopperCounterConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/WoolHopperCounterConfig.java index 4705b99..160ad0d 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/WoolHopperCounterConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/WoolHopperCounterConfig.java @@ -5,8 +5,8 @@ import fun.bm.lophine.command.counter.CounterCommand; import me.earthme.luminol.config.IConfigModule; import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; +import me.earthme.luminol.config.flags.DoNotLoad; import me.earthme.luminol.enums.EnumConfigCategory; -import org.bukkit.Bukkit; import org.jetbrains.annotations.Nullable; import java.util.Set; @@ -19,13 +19,23 @@ public class WoolHopperCounterConfig implements IConfigModule { @ConfigInfo(name = "unlimited-speed") public static boolean unlimitedSpeed = false; + @DoNotLoad + private static CounterCommand counterCommand = null; + @Override public void onLoaded(CommentedFileConfig configInstance, @Nullable Set exs) { - if (enabled) new CounterCommand().register(); + if (enabled) { + if (counterCommand == null) { + counterCommand = new CounterCommand(); + } + counterCommand.register(); + } } @Override public void onUnloaded(CommentedFileConfig configInstance) { - Bukkit.getCommandMap().getKnownCommands().remove("luminol:tpsbar"); + if (counterCommand != null) { + counterCommand.unregister(); + } } } diff --git a/lophine-server/src/main/java/fun/bm/lophine/utils/SaveAllUtil.java b/lophine-server/src/main/java/fun/bm/lophine/utils/SaveAllUtil.java index c23cdf9..ca20706 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/utils/SaveAllUtil.java +++ b/lophine-server/src/main/java/fun/bm/lophine/utils/SaveAllUtil.java @@ -30,9 +30,7 @@ public class SaveAllUtil { // we need to count how many regions we need to save AtomicInteger count = new AtomicInteger(); for (ServerLevel world : source.getServer().getAllLevels()) { - world.regioniser.computeForAllRegions(unused -> { - count.getAndIncrement(); - }); + world.regioniser.computeForAllRegions(unused -> count.getAndIncrement()); } regionCount = count.get(); savedRegionCount.set(0);