From cd9e3856a154358cbbe275c1987a64e8a7b20701 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Thu, 23 May 2024 21:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=A3=9E=E8=A1=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E7=89=B9=E6=9D=83=E6=9B=B4=E6=96=B0=E5=A4=B1=E6=95=88=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                                                   | 7 +------
 src/main/java/cn/lunadeer/dominion/Cache.java             | 8 ++++++--
 src/main/java/cn/lunadeer/dominion/dtos/Flag.java         | 4 +---
 .../cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java     | 2 +-
 .../java/cn/lunadeer/dominion/events/PlayerEvents.java    | 4 ----
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 961682f..de7b247 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>Dominion</artifactId>
-    <version>1.26.0-beta</version>
+    <version>1.26.2-beta</version>
     <packaging>jar</packaging>
 
     <name>Dominion</name>
@@ -96,10 +96,5 @@
             <version>1.7</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>2.0.31</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/cn/lunadeer/dominion/Cache.java b/src/main/java/cn/lunadeer/dominion/Cache.java
index d408e7b..f4a33ee 100644
--- a/src/main/java/cn/lunadeer/dominion/Cache.java
+++ b/src/main/java/cn/lunadeer/dominion/Cache.java
@@ -16,8 +16,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static cn.lunadeer.dominion.events.Apis.checkFlag;
-
 public class Cache {
 
     public Cache() {
@@ -203,6 +201,12 @@ public class Cache {
         if (!Flag.FLY.getEnable()) {
             return;
         }
+        if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR) {
+            return;
+        }
+        if (player.isOp() && Dominion.config.getLimitOpBypass()) {
+            return;
+        }
         if (dominion == null) {
             player.setAllowFlight(false);
             return;
diff --git a/src/main/java/cn/lunadeer/dominion/dtos/Flag.java b/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
index e84685f..60a9db9 100644
--- a/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
+++ b/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
@@ -2,11 +2,9 @@ package cn.lunadeer.dominion.dtos;
 
 import cn.lunadeer.dominion.Dominion;
 import cn.lunadeer.minecraftpluginutils.JsonFile;
-import cn.lunadeer.minecraftpluginutils.XLogger;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
-import java.io.*;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java b/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
index 7d547e9..6d694c5 100644
--- a/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
+++ b/src/main/java/cn/lunadeer/dominion/dtos/PlayerPrivilegeDTO.java
@@ -148,7 +148,7 @@ public class PlayerPrivilegeDTO {
             sql += f.getFlagName() + " = " + player.getFlagValue(f) + ", ";
         }
         sql = sql.substring(0, sql.length() - 2);
-        sql += "WHERE id = " + player.getId() + " " +
+        sql += " WHERE id = " + player.getId() + " " +
                 "RETURNING *;";
         List<PlayerPrivilegeDTO> players = query(sql);
         if (players.size() == 0) return null;
diff --git a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
index 1eb987f..e4fb826 100644
--- a/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
+++ b/src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
@@ -1,16 +1,13 @@
 package cn.lunadeer.dominion.events;
 
 import cn.lunadeer.dominion.Cache;
-import cn.lunadeer.dominion.Dominion;
 import cn.lunadeer.dominion.dtos.DominionDTO;
 import cn.lunadeer.dominion.dtos.Flag;
 import cn.lunadeer.dominion.dtos.PlayerDTO;
-import cn.lunadeer.dominion.dtos.PlayerPrivilegeDTO;
 import io.papermc.paper.event.entity.EntityDyeEvent;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -28,7 +25,6 @@ import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.*;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.material.Button;
 import org.spigotmc.event.entity.EntityMountEvent;
 
 import static cn.lunadeer.dominion.events.Apis.checkFlag;