Added #4

SIGMA-L · Sep 27, 2022 · eadcd72 · eadcd72
1 parent 9650833
commit eadcd72
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/jda/command/JoinCommand.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/jda/command/JoinCommand.java
@@ -48,7 +48,7 @@ public void onMessageReceiveEvent(CommandData event) throws Exception {
             Pair<Integer, PlayerData> pair = PlayerRoleChecker.INSTANCE.getConfigManager()
                     .canRegisterUnlimitedAccount() ? null : PlayerDataSQL.getInstance().getSize(event.getMember().getId());
 
-            if (pair != null && pair.getLeft() > PlayerRoleChecker.INSTANCE.getConfigManager().getAccountPerDiscord()) {
+            if (pair != null && pair.getLeft() >= PlayerRoleChecker.INSTANCE.getConfigManager().getAccountPerDiscord()) {
                 JoinEvent call = callEvent(new JoinEvent(pair.getRight().getUUID(), pair.getRight().getDiscordId(), temp.getCode(), pair.getRight().isBedrock(), event.getMessage(), JoinEventType.MAX_ACCOUNT_REGISTER));
 
                 if (!call.isCancelled()) {

diff --git a/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/table/PlayerDataSQL.java b/PlayerRoleChecker/src/main/java/net/klnetwork/playerrolechecker/table/PlayerDataSQL.java
@@ -208,7 +208,13 @@ public Pair<Integer, PlayerData> getSize(String discordId) {
             ResultSet resultSet = statement.executeQuery();
 
             if (resultSet.next()) {
-               return Pair.of(resultSet.getInt(0), new PlayerData(resultSet.getString(1), discordId, resultSet.getBoolean(2)));
+                final int size = resultSet.getInt(1);
+
+                if (size != 0) {
+                    return Pair.of(size, new PlayerData(resultSet.getString(2), discordId, resultSet.getBoolean(3)));
+                } else {
+                    return pair;
+                }
             }
         } catch (SQLException ex) {
             ex.printStackTrace();

diff --git a/PlayerRoleChecker/src/main/resources/config.yml b/PlayerRoleChecker/src/main/resources/config.yml
@@ -73,17 +73,17 @@ JoinCommand:
   max-account:
     color: 'RED'
     title: 'リクエストに失敗しました'
-    description: '理由: 上限に達しました (max: %max%)'
-    image:
+    description: '理由: 上限に達しました'
+    image: 'https://crafatar.com/avatars/%uuid%'
     timestamp: true
     message:
       - 'UUID: | %uuid% | false'
       - 'DiscordID: | %discordid% | false'
   max-account-bedrock:
     color: 'RED'
     title: 'リクエストに失敗しました'
-    description: '理由: 上限に達しました (max: %max%)'
-    image:
+    description: '理由: 上限に達しました'
+    image: 'attachment://user.png'
     timestamp: true
     message:
       - 'XUID: | %xuid% | false'

diff --git a/...erRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/utils/CommonUtils.java b/...erRoleCheckerAPI/src/main/java/net/klnetwork/playerrolechecker/api/utils/CommonUtils.java
@@ -156,6 +156,8 @@ public static Color getColor(String color) {
                     .getField(color.toUpperCase())
                     .get(null);
         } catch (Exception e) {
+            Bukkit.getLogger().warning("not founded Color (" + color + ")");
+
             e.printStackTrace();
         }
 
@@ -200,7 +202,7 @@ public static BufferedImage getImages(String url) {
 
             return ImageIO.read(stream);
         } catch (Exception ex) {
-            ex.printStackTrace();
+            /* ignored */
         } finally {
             close(stream);
         }
@@ -214,7 +216,7 @@ public static String getContent(String url) {
 
             return scanner.nextLine();
         } catch (Exception ex) {
-            ex.printStackTrace();
+            /* ignored */
         } finally {
             close(scanner);
         }

diff --git a/...Connector/src/main/java/net/klnetwork/playerrolecheckerconnector/table/PlayerDataSQL.java b/...Connector/src/main/java/net/klnetwork/playerrolecheckerconnector/table/PlayerDataSQL.java
@@ -208,7 +208,13 @@ public Pair<Integer, PlayerData> getSize(String discordId) {
             ResultSet resultSet = statement.executeQuery();
 
             if (resultSet.next()) {
-                return Pair.of(resultSet.getInt(0), new PlayerData(resultSet.getString(1), discordId, resultSet.getBoolean(2)));
+                final int size = resultSet.getInt(1);
+
+                if (size != 0) {
+                    return Pair.of(size, new PlayerData(resultSet.getString(2), discordId, resultSet.getBoolean(3)));
+                } else {
+                    return pair;
+                }
             }
         } catch (SQLException ex) {
             ex.printStackTrace();