diff --git a/src/engine/db/handlers/dbBlueprintHandler.java b/src/engine/db/handlers/dbBlueprintHandler.java index 194ca9fe..46d36ef7 100644 --- a/src/engine/db/handlers/dbBlueprintHandler.java +++ b/src/engine/db/handlers/dbBlueprintHandler.java @@ -55,7 +55,7 @@ public class dbBlueprintHandler extends dbHandlerBase { int recordsRead = 0; try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `obj_account` WHERE `acct_uname`=?")) { + PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_building_blueprint")) { ResultSet rs = preparedStatement.executeQuery(); diff --git a/src/engine/db/handlers/dbBoonHandler.java b/src/engine/db/handlers/dbBoonHandler.java index ca7b6db1..02951d4a 100644 --- a/src/engine/db/handlers/dbBoonHandler.java +++ b/src/engine/db/handlers/dbBoonHandler.java @@ -9,9 +9,12 @@ package engine.db.handlers; +import engine.gameManager.DbManager; import engine.objects.Boon; import org.pmw.tinylog.Logger; +import java.sql.Connection; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -20,32 +23,29 @@ public class dbBoonHandler extends dbHandlerBase { public dbBoonHandler() { } - - - public ArrayList GET_BOON_AMOUNTS_FOR_ITEMBASEUUID(int itemBaseUUID){ - - ArrayListboons = new ArrayList<>(); - Boon thisBoon; - prepareCallable("SELECT * FROM `static_item_boons` WHERE `itemBaseID` = ?"); - setInt(1, itemBaseUUID); - - try { - ResultSet rs = executeQuery(); - - while (rs.next()) { - - - thisBoon = new Boon(rs); - boons.add(thisBoon); + + + public ArrayList GET_BOON_AMOUNTS_FOR_ITEMBASE(int itemBaseUUID) { + + ArrayList boons = new ArrayList<>(); + Boon thisBoon; + + try (Connection connection = DbManager.getConnection(); + PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_boons` WHERE `itemBaseID` = ?")) { + + preparedStatement.setInt(1, itemBaseUUID); + + ResultSet rs = preparedStatement.executeQuery(); + + while (rs.next()) { + thisBoon = new Boon(rs); + boons.add(thisBoon); + } + + } catch (SQLException e) { + Logger.error(e); } - - - - } catch (SQLException e) { - Logger.error("GetBoonAmountsForItembaseUUID: " + e.getErrorCode() + ' ' + e.getMessage(), e); - } finally { - closeCallable(); + + return boons; } - return boons; -} } diff --git a/src/engine/objects/Boon.java b/src/engine/objects/Boon.java index 3c3bcb6d..29908b05 100644 --- a/src/engine/objects/Boon.java +++ b/src/engine/objects/Boon.java @@ -55,7 +55,7 @@ public class Boon { public static void HandleBoonListsForItemBase(int itemBaseID){ ArrayList boons = null; - boons = DbManager.BoonQueries.GET_BOON_AMOUNTS_FOR_ITEMBASEUUID(itemBaseID); + boons = DbManager.BoonQueries.GET_BOON_AMOUNTS_FOR_ITEMBASE(itemBaseID); if (boons != null) GetBoonsForItemBase.put(itemBaseID, boons); }