From 4498267c503f24e70eeee739949c2bbd2f95b9d3 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Thu, 4 Jul 2024 10:13:18 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lunadeer/dominion/controllers/DominionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java index 38ca2aa..46c5ecd 100644 --- a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java +++ b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java @@ -831,7 +831,7 @@ public class DominionController { level++; } if (level >= Dominion.config.getLimitDepth()) { - operator.setResponse(FAIL.addMessage("子领地嵌套深度不能超过 %s", Dominion.config.getLimitDepth())); + operator.setResponse(FAIL.addMessage("子领地嵌套深度不能超过 %d", Dominion.config.getLimitDepth())); return true; } return false; From a119cf747f3d4339016713567ea5991c95b21770 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Thu, 4 Jul 2024 10:22:14 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=B1=BB=E5=9E=8Bbstats=E7=BB=9F=E8=AE=A1=EF=BC=88?= =?UTF-8?q?=E5=8C=BF=E5=90=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/cn/lunadeer/dominion/Dominion.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2befe2..dce02fa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.0-beta + 1.35.1-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/Dominion.java b/src/main/java/cn/lunadeer/dominion/Dominion.java index 9b80fa2..8572f74 100644 --- a/src/main/java/cn/lunadeer/dominion/Dominion.java +++ b/src/main/java/cn/lunadeer/dominion/Dominion.java @@ -49,6 +49,8 @@ public final class Dominion extends JavaPlugin { Objects.requireNonNull(Bukkit.getPluginCommand("dominion")).setExecutor(new Commands()); bStatsMetrics metrics = new bStatsMetrics(this, 21445); + metrics.addCustomChart(new bStatsMetrics.SimplePie("database", () -> config.getDbType())); + if (config.getCheckUpdate()) { giteaReleaseCheck = new GiteaReleaseCheck(this, "https://ssl.lunadeer.cn:14446", From 26f87ab835d7e2403d531fd97cef27dcda33e086 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Thu, 4 Jul 2024 13:39:53 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=B0=86=E7=BB=8F=E6=B5=8E=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=88=9D=E5=A7=8B=E5=8C=96=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=8D=B3=E4=BE=BF=E9=87=8D=E8=BD=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B9=9F=E8=83=BDhook=E7=BB=8F=E6=B5=8E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/cn/lunadeer/dominion/Dominion.java | 4 ---- .../java/cn/lunadeer/dominion/managers/ConfigManager.java | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index dce02fa..891be6c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.1-beta + 1.35.2-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/Dominion.java b/src/main/java/cn/lunadeer/dominion/Dominion.java index 8572f74..10c4ebd 100644 --- a/src/main/java/cn/lunadeer/dominion/Dominion.java +++ b/src/main/java/cn/lunadeer/dominion/Dominion.java @@ -27,7 +27,6 @@ public final class Dominion extends JavaPlugin { new Notification(this); new XLogger(this); config = new ConfigManager(this); - XLogger.setDebug(config.isDebug()); new DatabaseManager(this, DatabaseType.valueOf(config.getDbType().toUpperCase()), config.getDbHost(), @@ -39,9 +38,6 @@ public final class Dominion extends JavaPlugin { new Scheduler(this); AutoClean.run(); Cache.instance = new Cache(); - if (config.getEconomyEnable()) { - new VaultConnect(this); - } Bukkit.getPluginManager().registerEvents(new PlayerEvents(), this); Bukkit.getPluginManager().registerEvents(new EnvironmentEvents(), this); diff --git a/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java b/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java index a7a87bc..9e396c0 100644 --- a/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java +++ b/src/main/java/cn/lunadeer/dominion/managers/ConfigManager.java @@ -2,6 +2,7 @@ package cn.lunadeer.dominion.managers; import cn.lunadeer.dominion.Dominion; import cn.lunadeer.dominion.dtos.Flag; +import cn.lunadeer.minecraftpluginutils.VaultConnect; import cn.lunadeer.minecraftpluginutils.XLogger; import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; @@ -82,6 +83,9 @@ public class ConfigManager { _economy_price = (float) _file.getDouble("Economy.Price", 10.0); _economy_only_xz = _file.getBoolean("Economy.OnlyXZ", false); _economy_refund = (float) _file.getDouble("Economy.Refund", 0.85); + if (getEconomyEnable()) { + new VaultConnect(this._plugin); + } _fly_permission_nodes = _file.getStringList("FlyPermissionNodes"); _residence_migration = _file.getBoolean("ResidenceMigration", false); saveAll(); // 回写文件 防止文件中的数据不完整 From 6a3f9fbd20859b85d77109c2dc6b77801f40c78b Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Thu, 4 Jul 2024 14:55:17 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=A2=86=E5=9C=B0=E6=97=B6=E9=A2=86=E5=9C=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=88=86?= =?UTF-8?q?=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../cn/lunadeer/dominion/commands/Apis.java | 3 ++- .../controllers/DominionController.java | 19 ++++++++++--------- .../dominion/cuis/CreateDominion.java | 5 ++--- .../lunadeer/dominion/dtos/DominionDTO.java | 10 +++++----- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 891be6c..0d3cce5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.2-beta + 1.35.3-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/commands/Apis.java b/src/main/java/cn/lunadeer/dominion/commands/Apis.java index cd94657..a26dc5c 100644 --- a/src/main/java/cn/lunadeer/dominion/commands/Apis.java +++ b/src/main/java/cn/lunadeer/dominion/commands/Apis.java @@ -36,7 +36,7 @@ public class Apis { Notification.info(sender, " 领地的对角点坐标： x1=%d y1=%d z1=%d, x2=%d y2=%d z2=%d", x1, y1, z1, x2, y2, z2); } - public static void autoPoints(Player player) { + public static Map autoPoints(Player player) { Integer size = Dominion.config.getAutoCreateRadius(); Location location = player.getLocation(); Location location1 = new Location(location.getWorld(), location.getX() - size, location.getY() - size, location.getZ() - size); @@ -49,6 +49,7 @@ public class Apis { points.put(0, location1); points.put(1, location2); Dominion.pointsSelect.put(player.getUniqueId(), points); + return points; } public static boolean notOpOrConsole(CommandSender sender) { diff --git a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java index 46c5ecd..e12c20c 100644 --- a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java +++ b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java @@ -12,6 +12,7 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -70,12 +71,12 @@ public class DominionController { * @param name 领地名称 * @param loc1 位置1 * @param loc2 位置2 - * @param parent_dominion_name 父领地名称 + * @param parent_dominion_name 父领地名称(留空表示为根领地) * @param skipEco 是否跳过经济检查 */ public static void create(AbstractOperator operator, String name, Location loc1, Location loc2, - String parent_dominion_name, boolean skipEco) { + @NotNull String parent_dominion_name, boolean skipEco) { AbstractOperator.Result FAIL = new AbstractOperator.Result(AbstractOperator.Result.FAILURE, "创建领地失败"); if (name.isEmpty()) { operator.setResponse(FAIL.addMessage("领地名称不能为空")); @@ -109,12 +110,8 @@ public class DominionController { loc2.getBlockX(), loc2.getBlockY(), loc2.getBlockZ())) { return; } - DominionDTO dominion = new DominionDTO(operator.getUniqueId(), name, loc1.getWorld().getName(), - (int) Math.min(loc1.getX(), loc2.getX()), (int) Math.min(loc1.getY(), loc2.getY()), - (int) Math.min(loc1.getZ(), loc2.getZ()), (int) Math.max(loc1.getX(), loc2.getX()), - (int) Math.max(loc1.getY(), loc2.getY()), (int) Math.max(loc1.getZ(), loc2.getZ())); DominionDTO parent_dominion; - if (parent_dominion_name.isEmpty()) { + if (parent_dominion_name.isEmpty() || parent_dominion_name.equals("root")) { parent_dominion = DominionDTO.select(-1); } else { parent_dominion = DominionDTO.select(parent_dominion_name); @@ -133,6 +130,11 @@ public class DominionController { return; } } + // 创建 dominion (此步骤不会写入数据) + DominionDTO dominion = DominionDTO.create(operator.getUniqueId(), name, loc1.getWorld().getName(), + (int) Math.min(loc1.getX(), loc2.getX()), (int) Math.min(loc1.getY(), loc2.getY()), + (int) Math.min(loc1.getZ(), loc2.getZ()), (int) Math.max(loc1.getX(), loc2.getX()), + (int) Math.max(loc1.getY(), loc2.getY()), (int) Math.max(loc1.getZ(), loc2.getZ()), parent_dominion); // 如果parent_dominion不为-1 检查是否在同一世界 if (parent_dominion.getId() != -1 && !parent_dominion.getWorld().equals(dominion.getWorld())) { operator.setResponse(FAIL.addMessage("父领地与子领地不在同一世界。")); @@ -176,7 +178,7 @@ public class DominionController { operator.setResponse(new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "已扣除 %.2f %s", price, VaultConnect.instance.currencyNamePlural())); VaultConnect.instance.withdrawPlayer(operator.getPlayer(), price); } - dominion = DominionDTO.insert(dominion); + dominion = DominionDTO.insert(dominion); // 写入数据 if (dominion == null) { operator.setResponse(FAIL.addMessage("创建领地失败，数据库错误，请联系管理员")); return; @@ -184,7 +186,6 @@ public class DominionController { if (operator instanceof BukkitPlayerOperator) { ParticleRender.showBoxFace(Dominion.instance, operator.getPlayer(), loc1, loc2); } - dominion.setParentDomId(parent_dominion.getId()); operator.setResponse(new AbstractOperator.Result(AbstractOperator.Result.SUCCESS, "成功创建领地 %s", name)); } diff --git a/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java b/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java index a1560cd..059ee25 100644 --- a/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java +++ b/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java @@ -30,12 +30,11 @@ public class CreateDominion { @Override public void handleData(String input) { XLogger.debug("createDominionCB.run: %s", input); - autoPoints(sender); + BukkitPlayerOperator operator = BukkitPlayerOperator.create(sender); Map points = Dominion.pointsSelect.get(sender.getUniqueId()); if (points == null || points.get(0) == null || points.get(1) == null) { - Notification.error(sender, "自动选点失败"); - return; + points = autoPoints(sender); } operator.getResponse().thenAccept(result -> { if (Objects.equals(result.getStatus(), AbstractOperator.Result.SUCCESS)) { diff --git a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java index cd488f4..c2c2a9e 100644 --- a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java +++ b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java @@ -191,6 +191,11 @@ public class DominionDTO { this(null, owner, name, world, x1, y1, z1, x2, y2, z2, -1); } + public static DominionDTO create(UUID owner, String name, String world, + Integer x1, Integer y1, Integer z1, Integer x2, Integer y2, Integer z2, DominionDTO parent) { + return new DominionDTO(null, owner, name, world, x1, y1, z1, x2, y2, z2, parent == null ? -1 : parent.getId()); + } + private final Field id = new Field("id", FieldType.INT); private final Field owner = new Field("owner", FieldType.STRING); private final Field name = new Field("name", FieldType.STRING); @@ -329,11 +334,6 @@ public class DominionDTO { return (Integer) parentDomId.value; } - public DominionDTO setParentDomId(Integer parentDomId) { - this.parentDomId.value = parentDomId; - return doUpdate(new UpdateRow().field(this.parentDomId)); - } - public String getJoinMessage() { return (String) joinMessage.value; } From f08e0f51e230458707c4aa8e8c7129d520f356c7 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Fri, 5 Jul 2024 11:53:04 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E8=B0=83=E7=94=A8=E4=BA=86paper=E7=89=B9=E6=AE=8Aapi?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=9C=A8spigot=E4=B8=8B=E6=9C=89=E6=A6=82?= =?UTF-8?q?=E7=8E=87=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../lunadeer/dominion/events/PlayerEvents.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 0d3cce5..a0f5fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.3-beta + 1.35.4-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java index 3d21d3d..9e64d40 100644 --- a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java +++ b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java @@ -103,7 +103,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // bed public void onBedUse(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Player bukkitPlayer = event.getPlayer(); @@ -165,7 +165,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // button public void onButton(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Player player = event.getPlayer(); @@ -182,7 +182,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // cake public void eatCake(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Block block = event.getClickedBlock(); @@ -280,7 +280,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // comparer public void comparerChange(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Block block = event.getClickedBlock(); @@ -298,7 +298,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // door public void doorUse(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Block block = event.getClickedBlock(); @@ -340,7 +340,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // edit sign public void onSignOpen(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Player player = event.getPlayer(); @@ -444,7 +444,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // honey public void honeyInteractive(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Block block = event.getClickedBlock(); @@ -502,7 +502,7 @@ public class PlayerEvents implements Listener { @EventHandler(priority = EventPriority.HIGHEST) // lever public void onLever(PlayerInteractEvent event) { - if (!event.getAction().isRightClick()) { + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) { return; } Block block = event.getClickedBlock(); From 0e1eb53465b665cdffc725676fbc74f687fc02fc Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sat, 6 Jul 2024 20:08:40 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=B0=86=E2=80=9C=E9=A2=86=E5=9C=B0?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BC=A0=E9=80=81=E7=82=B9=E2=80=9D=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E4=BB=8E=E6=8E=A7=E5=88=B6=E5=8F=B0=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=8E=A9=E5=AE=B6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/cn/lunadeer/dominion/commands/DominionOperate.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a0f5fa0..e79a49a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.4-beta + 1.35.5-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java b/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java index 92d4a9a..22b3a4a 100644 --- a/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java +++ b/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java @@ -433,10 +433,10 @@ public class DominionOperate { World world = Dominion.instance.getServer().getWorld(dominionDTO.getWorld()); if (location == null) { location = new Location(world, center_x, player.getLocation().getY(), center_z); - XLogger.warn("领地 %s 没有设置传送点，将尝试传送到中心点", dominionDTO.getName()); + Notification.warn(player, "领地 %s 没有设置传送点，将尝试传送到中心点", dominionDTO.getName()); } else if (!isInDominion(dominionDTO, location)) { location = new Location(world, center_x, player.getLocation().getY(), center_z); - XLogger.warn("领地 %s 传送点不在领地内，将尝试传送到中心点", dominionDTO.getName()); + Notification.warn(player, "领地 %s 传送点不在领地内，将尝试传送到中心点", dominionDTO.getName()); } if (player.isOnline()) { Teleport.doTeleportSafely(player, location).thenAccept(b -> { From 32c730e28c918b3a971c9b43d4ecef9028abd562 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sat, 6 Jul 2024 20:11:07 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=86=E5=9C=B0?= =?UTF-8?q?=E4=BC=A0=E9=80=81=E7=82=B9=E5=BC=82=E5=B8=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e79a49a..3f40e8e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.5-beta + 1.35.6-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java index c2c2a9e..c31a183 100644 --- a/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java +++ b/src/main/java/cn/lunadeer/dominion/dtos/DominionDTO.java @@ -374,7 +374,7 @@ public class DominionDTO { } public Location getTpLocation() { - if (Objects.equals(tp_location, "default")) { + if (Objects.equals(tp_location.value, "default")) { return null; } else { // 0:0:0 From e7a5e2b37f37adbb18f383ed3bfaa2a54cca694f Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sun, 7 Jul 2024 00:45:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../cn/lunadeer/dominion/tuis/template/TemplateSetting.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3f40e8e..ee8cea6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.6-beta + 1.35.7-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/tuis/template/TemplateSetting.java b/src/main/java/cn/lunadeer/dominion/tuis/template/TemplateSetting.java index d1ab2be..542996f 100644 --- a/src/main/java/cn/lunadeer/dominion/tuis/template/TemplateSetting.java +++ b/src/main/java/cn/lunadeer/dominion/tuis/template/TemplateSetting.java @@ -34,7 +34,7 @@ public class TemplateSetting { return; } - ListView view = ListView.create(10, "/dominion template manage " + template.getName()); + ListView view = ListView.create(10, "/dominion template setting " + template.getName()); view.title("模板 " + args[1] + " 权限管理"); view.navigator(Line.create() .append(Button.create("主菜单").setExecuteCommand("/dominion menu").build()) From eb9fd31277492adfe99a61ac7024b1daa5397509 Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sun, 7 Jul 2024 11:01:04 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=8F=9C=E5=8D=95=E5=88=9B=E5=BB=BA=E9=A2=86=E5=9C=B0?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E4=BC=9A=E8=87=AA=E5=8A=A8=E9=80=89=E7=82=B9?= =?UTF-8?q?=E6=88=96=E9=80=89=E7=82=B9=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../java/cn/lunadeer/dominion/cuis/CreateDominion.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index ee8cea6..c877ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer Dominion - 1.35.7-beta + 1.35.8-beta jar Dominion diff --git a/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java b/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java index 059ee25..33447e2 100644 --- a/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java +++ b/src/main/java/cn/lunadeer/dominion/cuis/CreateDominion.java @@ -1,11 +1,9 @@ package cn.lunadeer.dominion.cuis; -import cn.lunadeer.dominion.Dominion; import cn.lunadeer.dominion.controllers.AbstractOperator; import cn.lunadeer.dominion.controllers.BukkitPlayerOperator; import cn.lunadeer.dominion.controllers.DominionController; import cn.lunadeer.dominion.tuis.dominion.DominionManage; -import cn.lunadeer.minecraftpluginutils.Notification; import cn.lunadeer.minecraftpluginutils.XLogger; import cn.lunadeer.minecraftpluginutils.scui.CuiTextInput; import org.bukkit.Location; @@ -32,10 +30,7 @@ public class CreateDominion { XLogger.debug("createDominionCB.run: %s", input); BukkitPlayerOperator operator = BukkitPlayerOperator.create(sender); - Map points = Dominion.pointsSelect.get(sender.getUniqueId()); - if (points == null || points.get(0) == null || points.get(1) == null) { - points = autoPoints(sender); - } + Map points = autoPoints(sender); operator.getResponse().thenAccept(result -> { if (Objects.equals(result.getStatus(), AbstractOperator.Result.SUCCESS)) { DominionManage.show(sender, new String[]{"list"});