Minor cleanup in SessionLookup class

This commit is contained in:
Intelli 2022-02-15 20:20:46 -07:00
parent 50689604dd
commit c5d5308753

View file

@ -16,12 +16,16 @@ public class SessionLookup {
public static final int ID = 0; public static final int ID = 0;
private SessionLookup() {
throw new IllegalStateException("API class");
}
public static List<String[]> performLookup(String user, int offset) { public static List<String[]> performLookup(String user, int offset) {
List<String[]> result = new ArrayList<>();
if (!Config.getGlobal().API_ENABLED) { if (!Config.getGlobal().API_ENABLED) {
return null; return result;
} }
List<String[]> result = new ArrayList<>();
try (Connection connection = Database.getConnection(false, 1000)) { try (Connection connection = Database.getConnection(false, 1000)) {
if (connection == null || user == null) { if (connection == null || user == null) {
return result; return result;
@ -39,28 +43,28 @@ public class SessionLookup {
} }
int userId = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT)); int userId = ConfigHandler.playerIdCache.get(user.toLowerCase(Locale.ROOT));
Statement statement = connection.createStatement(); try (Statement statement = connection.createStatement()) {
String query = "SELECT time,user,wid,x,y,z,action FROM " + ConfigHandler.prefix + "session WHERE user = '" + userId + "' AND time > '" + checkTime + "' ORDER BY rowid DESC"; String query = "SELECT time,user,wid,x,y,z,action FROM " + ConfigHandler.prefix + "session WHERE user = '" + userId + "' AND time > '" + checkTime + "' ORDER BY rowid DESC";
ResultSet results = statement.executeQuery(query); ResultSet results = statement.executeQuery(query);
while (results.next()) { while (results.next()) {
String resultTime = results.getString("time"); String resultTime = results.getString("time");
int resultUserId = results.getInt("user"); int resultUserId = results.getInt("user");
String resultWorldId = results.getString("wid"); String resultWorldId = results.getString("wid");
String resultX = results.getString("x"); String resultX = results.getString("x");
String resultY = results.getString("y"); String resultY = results.getString("y");
String resultZ = results.getString("z"); String resultZ = results.getString("z");
String resultAction = results.getString("action"); String resultAction = results.getString("action");
if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) { if (ConfigHandler.playerIdCacheReversed.get(resultUserId) == null) {
UserStatement.loadName(connection, resultUserId); UserStatement.loadName(connection, resultUserId);
}
String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId);
String[] lookupData = new String[] { resultTime, resultUser, resultX, resultY, resultZ, resultWorldId, type, resultAction };
result.add(lookupData);
} }
String resultUser = ConfigHandler.playerIdCacheReversed.get(resultUserId); results.close();
String[] lookupData = new String[] { resultTime, resultUser, resultX, resultY, resultZ, resultWorldId, type, resultAction };
result.add(lookupData);
} }
results.close();
statement.close();
} }
catch (Exception e) { catch (Exception e) {
e.printStackTrace(); e.printStackTrace();