模式锁定应用后，到其他未设置世界恢复成服务器默认模式

glorydark · Feb 20, 2024 · 9fb7cea · 9fb7cea
1 parent 02d0dba
commit 9fb7cea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>glorydark.nukkit</groupId>
     <artifactId>DLevelEventPlus</artifactId>
-    <version>1.2.1.3</version>
+    <version>1.2.1.4</version>
 
     <properties>
         <maven.complier.sourceEncoding>UTF-8</maven.complier.sourceEncoding>

diff --git a/src/main/java/glorydark/DLevelEventPlus/CheckTask.java b/src/main/java/glorydark/DLevelEventPlus/CheckTask.java
@@ -67,7 +67,14 @@ public void onRun(int i) {
                     }
                 }
                 if (forceGamemode != -1) {
-                    player.setGamemode(forceGamemode);
+                    if (player.getGamemode() != forceGamemode) {
+                        player.setGamemode(forceGamemode);
+                    }
+                } else {
+                    int defaultGamemode = Server.getInstance().getDefaultGamemode();
+                    if (player.getGamemode() != defaultGamemode) {
+                        player.setGamemode(defaultGamemode);
+                    }
                 }
             }
         }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: DLevelEventPlus
 main: glorydark.DLevelEventPlus.LevelEventPlusMain
-version: "1.2.1.3"
+version: "1.2.1.4"
 author: glorydark
 api: ["1.0.0"]
 description: DLevelEventPlus