Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle.kts
This commit is contained in:
zhangyuheng 2024-08-11 02:00:10 +08:00
commit ee470c6cad
2 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@ plugins {
}
group = "cn.lunadeer"
version = "2.1.0-beta"
version = "2.1.3-beta"
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))

View File

@ -31,10 +31,10 @@ public class SysConfig {
Line spawnProtect = Line.create()
.append(Component.text(" 出生点保护范围"));
if (Dominion.config.getLimitSizeX() == -1) {
if (Dominion.config.getSpawnProtection() == -1) {
spawnProtect.append(Component.text("无限制")).append(Button.create("设置数值").setExecuteCommand("/dominion set_config spawn_protection 10 " + page).build());
} else {
spawnProtect.append(NumChanger.create(Dominion.config.getLimitSizeX(), "/dominion set_config spawn_protection").setPageNumber(page).build());
spawnProtect.append(NumChanger.create(Dominion.config.getSpawnProtection(), "/dominion set_config spawn_protection").setPageNumber(page).build());
spawnProtect.append(Button.create("设置无限制").setExecuteCommand("/dominion set_config spawn_protection -1 " + page).build());
}
view.add(spawnProtect);