新增op可绕过经济检查

ColdeZhang · Jul 20, 2024 · 9a11f4b · 9a11f4b
1 parent 00193c5
commit 9a11f4b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -43,7 +43,7 @@ public static Map<Integer, Location> autoPoints(Player player) {
         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
@@ -765,6 +765,10 @@ private static boolean handleEconomyFailed(AbstractOperator operator, Integer co
                 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
@@ -52,7 +52,7 @@ public void selectPoint(PlayerInteractEvent event) {
             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 {