fix

RegadPoleCN · Jul 12, 2024 · 1802e6e · 1802e6e
1 parent 99bf8b3
commit 1802e6e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 9 deletions.
diff --git a/plumbot-bukkit/src/main/java/me/regadpole/plumbot/config/Config.java b/plumbot-bukkit/src/main/java/me/regadpole/plumbot/config/Config.java
@@ -41,7 +41,7 @@ public static void createConfig(){
         if (!Config.getBotYamlVersion().equals("1.3.0")){
             INSTANCE.saveResource(botFile.getName(), true);
         }
-        if (!Config.getConfigYamlVersion().equals("1.3.2")){
+        if (!Config.getConfigYamlVersion().equals("1.3.3")){
             INSTANCE.saveResource(configFile.getName(), true);
         }
         if (!Config.getCommandsYamlVersion().equals("1.2.2")){

diff --git a/plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/server/ServerEvent.java b/plumbot-bukkit/src/main/java/me/regadpole/plumbot/event/server/ServerEvent.java
@@ -104,14 +104,48 @@ public void onPreLogin(AsyncPlayerPreLoginEvent event){
     @EventHandler(priority = EventPriority.MONITOR)
     public void onJoin(PlayerJoinEvent event){
 
-        String name = event.getPlayer().getName();
+        Player player = event.getPlayer();
+        String name = player.getName();
 
-        if (!Config.JoinAndLeave()){
-            return;
-        }
-        List<Long> groups = Config.getGroupQQs();
-        for (long groupID : groups){
-            PlumBot.getBot().sendMsg(true, "玩家"+name+"加入游戏",groupID);
+        if (Config.WhiteList()) {
+            PlumBot.getScheduler().runTaskAsynchronously(() -> {
+                long qq;
+                qq = (DatabaseManager.getBindId(name, DataBase.type().toLowerCase(), PlumBot.getDatabase()));
+                if (qq == 0L) {
+                    player.kickPlayer(Args.WhitelistKick());
+                    List<Long> groups = Config.getGroupQQs();
+                    for (long groupID : groups) {
+                        PlumBot.getBot().sendMsg(true, "玩家" + name + "因为未在白名单中被踢出", groupID);
+                    }
+                    return;
+                }
+                for (long groupID : Config.getGroupQQs()) {
+                    if(!PlumBot.getBot().checkUserInGroup(qq, groupID)){
+                        player.kickPlayer(Args.WhitelistKick());
+                        List<Long> groups = Config.getGroupQQs();
+                        for (long group : groups) {
+                            PlumBot.getBot().sendMsg(true, "玩家" + name + "因为未在白名单中被踢出", group);
+                        }
+                        DatabaseManager.removeBind(String.valueOf(qq), DataBase.type().toLowerCase(), PlumBot.getDatabase());
+                        return;
+                    }
+                }
+                if (!Config.JoinAndLeave()){
+                    return;
+                }
+                List<Long> groups = Config.getGroupQQs();
+                for (long groupID : groups){
+                    PlumBot.getBot().sendMsg(true, "玩家"+name+"加入游戏",groupID);
+                }
+            });
+        } else {
+            if (!Config.JoinAndLeave()){
+                return;
+            }
+            List<Long> groups = Config.getGroupQQs();
+            for (long groupID : groups){
+                PlumBot.getBot().sendMsg(true, "玩家"+name+"加入游戏",groupID);
+            }
         }
     }
 

diff --git a/plumbot-bukkit/src/main/resources/config.yml b/plumbot-bukkit/src/main/resources/config.yml
@@ -1,5 +1,5 @@
 #机器人功能设置
-Ver: "1.3.2"
+Ver: "1.3.3"
 
 #QQ群聊命令前缀
 Prefix: "/"