[Fix] ResultSet close timing to get userdata

Author: sysnote8main

src/main/java/jp/azisaba/lgw/kdstatus/sql/KillDeathDataContainer.java

@@ -97,30 +97,7 @@ public KDUserData loadPlayerData(@NonNull Player p) {
                 e.printStackTrace();
             }
         }else{
-
-            ResultSet set = KDStatusReloaded.getPlugin().getKDData().getRawData(p.getUniqueId());
-
-            try {
-                if ( set.next() ) {
-                    int totalKills = set.getInt("kills");
-                    int deaths = set.getInt("deaths");
-                    int dailyKills = set.getInt("daily_kills");
-                    int monthlyKills = set.getInt("monthly_kills");
-                    int yearlyKills = set.getInt("yearly_kills");
-                    long lastUpdated = set.getLong("last_updated");
-
-                    data = new KDUserData(p.getUniqueId(), p.getName(), totalKills, deaths, dailyKills, monthlyKills, yearlyKills, lastUpdated);
-                } else {
-                    data = new KDUserData(p.getUniqueId(), p.getName(), 0, 0, 0, 0, 0, -1);
-                    KDStatusReloaded.getPlugin().getKDData().create(data);
-                }
-
-                set.close();
-
-            } catch ( Exception e ) {
-                e.printStackTrace();
-            }
-
+            data = KDStatusReloaded.getPlugin().getKDData().getUserData(p.getUniqueId(), p.getName());
         }
 
         // データがnullの場合はnullを返す

src/main/java/jp/azisaba/lgw/kdstatus/sql/PlayerDataMySQLController.java

@@ -214,6 +214,38 @@ public ResultSet getRawData(@NonNull UUID uuid) {
         return null;
     }
 
+    /**
+     * @param uuid UUID of target player
+     * @param name Name of target player
+     * @return returns userdata. If failed, returns null.
+     */
+    public KDUserData getUserData(@NonNull UUID uuid, @NonNull String name) {
+        try(Connection conn = plugin.sql.getConnection();
+            PreparedStatement ps = conn.prepareStatement("SELECT * FROM kill_death_data WHERE uuid=?")) {
+            ps.setString(1, uuid.toString());
+            ResultSet rs = ps.executeQuery();
+            if(rs.next()) {
+                int totalKills = rs.getInt("kills");
+                int deaths = rs.getInt("deaths");
+                int dailyKills = rs.getInt("daily_kills");
+                int monthlyKills = rs.getInt("monthly_kills");
+                int yearlyKills = rs.getInt("yearly_kills");
+                long lastUpdated = rs.getLong("last_updated");
+                rs.close();
+
+                return new KDUserData(uuid, name, totalKills, deaths, dailyKills, monthlyKills, yearlyKills, lastUpdated);
+            } else {
+                rs.close();
+                KDUserData data = new KDUserData(uuid, name, 0, 0, 0, 0, 0, -1);
+                KDStatusReloaded.getPlugin().getKDData().create(data);
+                return data;
+            }
+        } catch (SQLException throwables) {
+            throwables.printStackTrace();
+        }
+        return null;
+    }
+
     public static final String RANK_QUERY = "SELECT * FROM (SELECT uuid, ?, last_updated, RANK() over (ORDER BY ? DESC) as 'rank' FROM kill_death_data WHERE last_updated > ?) s WHERE s.uuid=?";
 
     public int getRank(UUID uuid,TimeUnit unit){