diff options
Diffstat (limited to '')
6 files changed, 6 insertions, 22 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java index 8afc4ba..e7bfb26 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java @@ -104,6 +104,7 @@ public class Database { } } + @SuppressWarnings("UnstableApiUsage") protected UUID decodeUUID(byte[] bytes) { InputStream is = new ByteArrayInputStream(bytes); ByteBuffer buffer = ByteBuffer.allocate(16); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java index 929356e..8f0ddde 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/GameDataTable.java @@ -200,8 +200,7 @@ public class GameDataTable { } } - protected boolean updateInfo(@NotNull byte[] uuid, int hider_wins, int seeker_wins, int hider_games, int seeker_games, int hider_kills, int seeker_kills, int hider_deaths, int seeker_deaths){ - boolean success; + protected void updateInfo(byte[] uuid, int hider_wins, int seeker_wins, int hider_games, int seeker_games, int hider_kills, int seeker_kills, int hider_deaths, int seeker_deaths){ String sql = "INSERT OR REPLACE INTO hs_data (uuid, hider_wins, seeker_wins, hider_games, seeker_games, hider_kills, seeker_kills, hider_deaths, seeker_deaths) VALUES (?,?,?,?,?,?,?,?,?)"; try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) { statement.setBytes(1, uuid); @@ -214,16 +213,12 @@ public class GameDataTable { statement.setInt(8, hider_deaths); statement.setInt(9, seeker_deaths); statement.execute(); - statement.close(); - success = true; } catch (SQLException e) { Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage()); e.printStackTrace(); - success = false; } finally { CACHE.remove(database.decodeUUID(uuid)); } - return success; } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/InventoryTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/InventoryTable.java index 814ea5e..0ff2225 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/InventoryTable.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/InventoryTable.java @@ -58,19 +58,16 @@ public class InventoryTable { return null; } - public boolean saveInventory(@NotNull UUID uuid, @NotNull ItemStack[] itemArray) { + public void saveInventory(@NotNull UUID uuid, @NotNull ItemStack[] itemArray) { String sql = "INSERT OR REPLACE INTO hs_inventory (uuid, inventory) VALUES (?,?)"; String data = itemStackArrayToBase64(itemArray); try(Connection connection = database.connect(); PreparedStatement statement = connection.prepareStatement(sql)) { statement.setBytes(1, database.encodeUUID(uuid)); statement.setString(2, data); statement.execute(); - statement.close(); - return true; } catch (SQLException e) { Main.getInstance().getLogger().severe("SQL Error: " + e.getMessage()); e.printStackTrace(); - return false; } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/LegacyTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/LegacyTable.java index 580c2f5..e134c22 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/LegacyTable.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/LegacyTable.java @@ -19,8 +19,6 @@ package net.tylermurphy.hideAndSeek.database; -import net.tylermurphy.hideAndSeek.Main; -import net.tylermurphy.hideAndSeek.database.Database; import net.tylermurphy.hideAndSeek.database.util.LegacyPlayerInfo; import java.sql.Connection; @@ -63,7 +61,6 @@ public class LegacyTable { while(resultSet.next()){ legacyPlayerInfoList.add(new LegacyPlayerInfo( resultSet.getBytes("uuid"), - resultSet.getInt("wins"), resultSet.getInt("hider_wins"), resultSet.getInt("seeker_wins"), resultSet.getInt("games_played") diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/NameDataTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/NameDataTable.java index dd32507..02d90cf 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/NameDataTable.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/NameDataTable.java @@ -25,7 +25,6 @@ import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.lang.management.BufferPoolMXBean; import java.sql.*; import java.util.UUID; @@ -66,13 +65,14 @@ public class NameDataTable { e.printStackTrace(); } OfflinePlayer retry = Bukkit.getOfflinePlayer(uuid); - if(retry != null){ + if(retry != null && retry.getName() != null){ this.update(uuid, retry.getName()); return retry.getName(); } return null; } + @SuppressWarnings("deprecation") @Nullable public UUID getUUID(@NotNull String name) { String sql = "SELECT * FROM hs_names WHERE name = ?;"; diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/util/LegacyPlayerInfo.java b/src/main/java/net/tylermurphy/hideAndSeek/database/util/LegacyPlayerInfo.java index 5b59779..067ab0b 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/util/LegacyPlayerInfo.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/util/LegacyPlayerInfo.java @@ -19,19 +19,15 @@ package net.tylermurphy.hideAndSeek.database.util; -import java.util.UUID; - public class LegacyPlayerInfo { private final byte[] uniqueId; - private final int totalWins; private final int hiderWins; private final int seekerWins; private final int gamesPlayed; - public LegacyPlayerInfo(byte[] uniqueId, int totalWins, int hiderWins, int seekerWins, int gamesPlayed) { + public LegacyPlayerInfo(byte[] uniqueId, int hiderWins, int seekerWins, int gamesPlayed) { this.uniqueId = uniqueId; - this.totalWins = totalWins; this.hiderWins = hiderWins; this.seekerWins = seekerWins; this.gamesPlayed = gamesPlayed; @@ -41,8 +37,6 @@ public class LegacyPlayerInfo { return uniqueId; } - public int getTotalWins() { return totalWins; } - public int getHiderWins() { return hiderWins; } |