GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-27 10:49:13 +00:00
Code Issues Releases Activity

Close stuff correctly

Browse Source
This commit is contained in:
Tim203
2021-03-28 20:44:05 +02:00
parent d27cc9479f
commit 0bbe3d8cf1
3 changed files with 116 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
View File

@@ -91,14 +91,14 @@ public class SqliteDatabase extends CommonPlayerLink {
"select * from LinkedPlayers where bedrockId = ?")) {
query.setString(1, bedrockId.toString());
ResultSet result = query.executeQuery();
if (!result.next()) {
return null;
try (ResultSet result = query.executeQuery()) {
if (!result.next()) {
return null;
}
String javaUsername = result.getString("javaUsername");
UUID javaUniqueId = UUID.fromString(result.getString("javaUniqueId"));
return LinkedPlayer.of(javaUsername, javaUniqueId, bedrockId);
}
String javaUsername = result.getString("javaUsername");
UUID javaUniqueId = UUID.fromString(result.getString("javaUniqueId"));
return LinkedPlayer.of(javaUsername, javaUniqueId, bedrockId);
} catch (SQLException exception) {
getLogger().error("Error while getting LinkedPlayer", exception);
throw new CompletionException("Error while getting LinkedPlayer", exception);
@@ -115,8 +115,9 @@ public class SqliteDatabase extends CommonPlayerLink {
query.setString(1, playerId.toString());
query.setString(2, playerId.toString());
ResultSet result = query.executeQuery();
return result.next();
try (ResultSet result = query.executeQuery()) {
return result.next();
}
} catch (SQLException exception) {
getLogger().error("Error while checking if player is a LinkedPlayer", exception);
throw new CompletionException(
@@ -173,8 +174,7 @@ public class SqliteDatabase extends CommonPlayerLink {
public CompletableFuture<String> createLinkRequest(
@NonNull UUID javaId,
@NonNull String javaUsername,
@NonNull String bedrockUsername
) {
@NonNull String bedrockUsername) {
return CompletableFuture.supplyAsync(() -> {
LinkRequest request =
new LinkRequestImpl(javaUsername, javaId, createCode(), bedrockUsername);
@@ -191,8 +191,7 @@ public class SqliteDatabase extends CommonPlayerLink {
@NonNull UUID bedrockId,
@NonNull String javaUsername,
@NonNull String bedrockUsername,
@NonNull String code
) {
@NonNull String code) {
return CompletableFuture.supplyAsync(() -> {
LinkRequest request = activeLinkRequests.get(javaUsername);