Created getObjectsFromRs()

src/engine/db/handlers/dbBaseClassHandler.java

@@ -13,7 +13,12 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
 import engine.objects.BaseClass;
+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;
 
 public class dbBaseClassHandler extends dbHandlerBase {
@@ -27,24 +32,61 @@ public class dbBaseClassHandler extends dbHandlerBase {
 
 		if (id == 0)
 			return null;
+
 		BaseClass baseClass = (BaseClass) DbManager.getFromCache(GameObjectType.BaseClass, id);
+
 		if (baseClass != null)
 			return baseClass;
 
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `obj_account` WHERE `UID`=?")) {
 
-		prepareCallable("SELECT * FROM `static_rune_baseclass` WHERE `ID` = ?;");
-		setInt(1, id);
-		return (BaseClass) getObjectSingle(id);
+			preparedStatement.setLong(1, id);
+
+			ResultSet rs = preparedStatement.executeQuery();
+			baseClass = (BaseClass) getObjectFromRs(rs);
+
+		} catch (SQLException e) {
+			Logger.error(e);
+		}
+
+		return baseClass;
 	}
 
 	public ArrayList<BaseClass> GET_BASECLASS_FOR_RACE(final int id) {
-		prepareCallable("SELECT b.* FROM `static_rune_baseclass` b, `static_rune_racebaseclass` r WHERE b.`ID` = r.`BaseClassID` && r.`RaceID` = ?");
-		setInt(1, id);
-		return getObjectList();
+
+		ArrayList<BaseClass> baseClasses = new ArrayList<>();
+
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT b.* FROM `static_rune_baseclass` b, `static_rune_racebaseclass` r WHERE b.`ID` = r.`BaseClassID` && r.`RaceID` = ?")) {
+
+			preparedStatement.setInt(1, id);
+
+			ResultSet rs = preparedStatement.executeQuery();
+			baseClasses = getObjectsFromRs(rs, 20);
+
+		} catch (SQLException e) {
+			Logger.error(e);
+		}
+
+		return baseClasses;
 	}
 
-	public ArrayList<BaseClass> GET_ALL_BASE_CLASSES(){
-		prepareCallable("SELECT * FROM `static_rune_baseclass`;");
-		return  getObjectList();
+	public ArrayList<BaseClass> GET_ALL_BASE_CLASSES() {
+
+		ArrayList<BaseClass> baseClasses = new ArrayList<>();
+
+		try (Connection connection = DbManager.getConnection();
+			 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_rune_baseclass`;")) {
+
+			ResultSet rs = preparedStatement.executeQuery();
+			baseClasses = getObjectsFromRs(rs, 20);
+
+		} catch (SQLException e) {
+			Logger.error(e);
+		}
+
+		return baseClasses;
+
 	}
 }