From ba495d9bd7ca268435af42e3304c7369aafbcd7b Mon Sep 17 00:00:00 2001 From: zhangyuheng Date: Sat, 24 Aug 2024 19:15:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A2=86=E5=9C=B0tp=E7=82=B9=E6=8A=A5=E9=94=99=E6=9C=AA?= =?UTF-8?q?=E6=8D=95=E8=8E=B7=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- .../cn/lunadeer/dominion/commands/DominionOperate.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 716e98c..0664a65 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "cn.lunadeer" -version = "2.2.2-beta" +version = "2.2.3-beta" java { toolchain.languageVersion.set(JavaLanguageVersion.of(21)) diff --git a/core/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java b/core/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java index 0162dba..cc4b042 100644 --- a/core/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java +++ b/core/src/main/java/cn/lunadeer/dominion/commands/DominionOperate.java @@ -392,6 +392,10 @@ public class DominionOperate { int x = (dominionDTO.getX1() + dominionDTO.getX2()) / 2; int z = (dominionDTO.getZ1() + dominionDTO.getZ2()) / 2; World world = Dominion.instance.getServer().getWorld(dominionDTO.getWorld()); + if (world == null) { + Notification.error(sender, "领地所在世界 %s 不存在", dominionDTO.getWorld()); + return; + } location = new Location(world, x, player.getLocation().getY(), z); XLogger.warn("领地 %s 没有设置传送点，将尝试传送到中心点", dominionDTO.getName()); } @@ -460,6 +464,10 @@ public class DominionOperate { int center_x = (dominionDTO.getX1() + dominionDTO.getX2()) / 2; int center_z = (dominionDTO.getZ1() + dominionDTO.getZ2()) / 2; World world = Dominion.instance.getServer().getWorld(dominionDTO.getWorld()); + if (world == null) { + Notification.error(player, "领地所在世界 %s 不存在", dominionDTO.getWorld()); + return; + } if (location == null) { location = new Location(world, center_x, player.getLocation().getY(), center_z); Notification.warn(player, "领地 %s 没有设置传送点，将尝试传送到中心点", dominionDTO.getName());