MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Refactor to remove abstraction

Browse Source
This commit is contained in:
MagicBot
2023-05-23 09:57:17 -04:00
parent 3dd27976fe
commit f7da137e0f
2 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/db/handlers/dbBuildingHandler.java
+1 -1
View File
@@ -146,8 +146,8 @@ public class dbBuildingHandler extends dbHandlerBase {
} catch (SQLException e) {
Logger.error("Building", e);
return null;
}
return building;
}
src/engine/db/handlers/dbZoneHandler.java
+58 -28
View File
@@ -12,8 +12,12 @@ package engine.db.handlers;
import engine.Enum;
import engine.gameManager.DbManager;
import engine.objects.Zone;
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 dbZoneHandler extends dbHandlerBase {
@@ -46,48 +50,74 @@ public class dbZoneHandler extends dbHandlerBase {
public Zone GET_BY_UID(long ID) {
Zone zone = (Zone) DbManager.getFromCache(Enum.GameObjectType.Zone, (int)ID);
Zone zone = (Zone) DbManager.getFromCache(Enum.GameObjectType.Zone, (int) ID);
if (zone != null)
return zone;
prepareCallable("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`UID` = ?;");
setLong(1, ID);
return (Zone) getObjectSingle((int) ID);
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`UID` = ?;")) {
preparedStatement.setLong(1, ID);
ResultSet rs = preparedStatement.executeQuery();
zone = (Zone) getObjectFromRs(rs);
} catch (SQLException e) {
Logger.error(e);
}
return zone;
}
public ArrayList<Zone> GET_MAP_NODES(final int objectUUID) {
prepareCallable("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;");
setLong(1, (long) objectUUID);
return getObjectList();
ArrayList<Zone> zoneList = new ArrayList<>();
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
preparedStatement.setLong(1, (long) objectUUID);
ResultSet rs = preparedStatement.executeQuery();
zoneList = getObjectsFromRs(rs, 2000);
} catch (SQLException e) {
Logger.error(e);
}
return zoneList;
}
public ResultSet GET_ZONE_EXTENTS(final int loadNum) {
prepareCallable("SELECT * FROM `static_zone_size` WHERE `loadNum`=?;");
setInt(1, loadNum);
return executeQuery();
}
public String SET_PROPERTY(final Zone z, String name, Object new_value) {
prepareCallable("CALL zone_SETPROP(?,?,?)");
setLong(1, (long) z.getObjectUUID());
setString(2, name);
setString(3, String.valueOf(new_value));
return getResult();
}
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_zone_size` WHERE `loadNum`=?;")) {
public String SET_PROPERTY(final Zone z, String name, Object new_value, Object old_value) {
prepareCallable("CALL zone_GETSETPROP(?,?,?,?)");
setLong(1, (long) z.getObjectUUID());
setString(2, name);
setString(3, String.valueOf(new_value));
setString(4, String.valueOf(old_value));
return getResult();
preparedStatement.setInt(1, loadNum);
return preparedStatement.executeQuery();
} catch (SQLException e) {
Logger.error(e);
}
return null;
}
public boolean DELETE_ZONE(final Zone zone) {
prepareCallable("DELETE FROM `object` WHERE `UID` = ? AND `type` = 'zone'");
setInt(1, zone.getObjectUUID());
return (executeUpdate() != 0);
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `object` WHERE `UID` = ? AND `type` = 'zone'")) {
preparedStatement.setInt(1, zone.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
}
return false;
}
}