From 9a11f4b1f915f81f7014b8f33e635fc7e25b7a1c Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Sun, 21 Jul 2024 01:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eop=E5=8F=AF=E7=BB=95=E8=BF=87?=
 =?UTF-8?q?=E7=BB=8F=E6=B5=8E=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                       | 2 +-
 src/main/java/cn/lunadeer/dominion/commands/Apis.java         | 2 +-
 .../cn/lunadeer/dominion/controllers/DominionController.java  | 4 ++++
 .../java/cn/lunadeer/dominion/events/SelectPointEvents.java   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 49684e2..c11d8c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.38.5-beta</version>
+    <version>1.38.6-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
diff --git a/src/main/java/cn/lunadeer/dominion/commands/Apis.java b/src/main/java/cn/lunadeer/dominion/commands/Apis.java
index a26dc5c..c166312 100644
--- a/src/main/java/cn/lunadeer/dominion/commands/Apis.java
+++ b/src/main/java/cn/lunadeer/dominion/commands/Apis.java
@@ -43,7 +43,7 @@ public class Apis {
         Location location2 = new Location(location.getWorld(), location.getX() + size, location.getY() + size, location.getZ() + size);
         if (Dominion.config.getLimitVert()) {
             location1.setY(Dominion.config.getLimitMinY());
-            location2.setY(Dominion.config.getLimitMaxY());
+            location2.setY(Dominion.config.getLimitMaxY() - 1);
         }
         Map<Integer, Location> points = new HashMap<>();
         points.put(0, location1);
diff --git a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
index bf52504..47644bf 100644
--- a/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
+++ b/src/main/java/cn/lunadeer/dominion/controllers/DominionController.java
@@ -765,6 +765,10 @@ public class DominionController {
                 operator.setResponse(FAIL.addMessage("没有可用的经济插件系统，请联系服主。"));
                 return true;
             }
+            if (operator.isOp() && Dominion.config.getLimitOpBypass()) {
+                SUCCESS.addMessage("你是OP，已跳过经济检查。");
+                return false;
+            }
             float priceOrRefund = count * Dominion.config.getEconomyPrice();
             if (paid) {
                 if (VaultConnect.instance.getBalance(operator.getPlayer()) < priceOrRefund) {
diff --git a/src/main/java/cn/lunadeer/dominion/events/SelectPointEvents.java b/src/main/java/cn/lunadeer/dominion/events/SelectPointEvents.java
index 58c07f8..97cee02 100644
--- a/src/main/java/cn/lunadeer/dominion/events/SelectPointEvents.java
+++ b/src/main/java/cn/lunadeer/dominion/events/SelectPointEvents.java
@@ -52,7 +52,7 @@ public class SelectPointEvents implements Listener {
             Notification.info(player, "已选择第二个点: %d %d %d", block.getX(), block.getY(), block.getZ());
             Location loc = block.getLocation();
             if (Dominion.config.getLimitVert()) {
-                loc.setY(Dominion.config.getLimitMaxY());
+                loc.setY(Dominion.config.getLimitMaxY() - 1);
             }
             points.put(1, loc);
         } else {