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

Remove the dead skill and power DB loaders

Browse Source 
Deletes the uncalled static_rune_skill_adjusts, static_rune_maxskills,
static_skill_skillsgranted, static_skill_skillreq and static_power_powergrant
loaders and their ResultSet constructors. LOAD_RUNE_POWERS stays for the 14
Magister Captain guard contract ids. No value changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
MagicBotandClaude Opus 5.5 committed 2026-10-22 12:42:19 -04:00
1 parent d576ed1468
commit 8b9aa43c1b
7 files changed
+2 -215
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/engine/db/handlers/dbRuneBaseHandler.java
-40
View File
@@ -13,7 +13,6 @@ import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.objects.RuneBase;
import engine.powers.RunePowerEntry;
import engine.powers.RuneSkillAdjustEntry;
import org.pmw.tinylog.Logger;
import java.sql.Connection;
@@ -68,43 +67,4 @@ public class dbRuneBaseHandler extends dbHandlerBase {
Logger.info("read: " + recordsRead + " cached: " + mobPowers.size());
return mobPowers;
}
public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> LOAD_RUNE_SKILL_ADJUSTS() {
HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> runeSkillAdjusts = new HashMap<>();
RuneSkillAdjustEntry runeSkillAdjustEntry;
int rune_id;
int recordsRead = 0;
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_rune_skill_adjusts")) {
ResultSet rs = preparedStatement.executeQuery();
while (rs.next()) {
recordsRead++;
rune_id = rs.getInt("rune_id");
runeSkillAdjustEntry = new RuneSkillAdjustEntry(rs);
if (runeSkillAdjusts.get(rune_id) == null) {
ArrayList<RuneSkillAdjustEntry> skillAdjustList = new ArrayList<>();
skillAdjustList.add(runeSkillAdjustEntry);
runeSkillAdjusts.put(rune_id, skillAdjustList);
} else {
ArrayList<RuneSkillAdjustEntry> powerList = runeSkillAdjusts.get(rune_id);
powerList.add(runeSkillAdjustEntry);
runeSkillAdjusts.put(rune_id, powerList);
}
}
} catch (SQLException e) {
Logger.error(e);
return runeSkillAdjusts;
}
Logger.info("read: " + recordsRead + " cached: " + runeSkillAdjusts.size());
return runeSkillAdjusts;
}
}
src/engine/db/handlers/dbSkillBaseHandler.java
-54
View File
@@ -12,7 +12,6 @@ package engine.db.handlers;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.objects.MaxSkills;
import engine.objects.SkillsBase;
import org.pmw.tinylog.Logger;
@@ -20,8 +19,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
public class dbSkillBaseHandler extends dbHandlerBase {
@@ -98,55 +95,4 @@ public class dbSkillBaseHandler extends dbHandlerBase {
SkillsBase.putInCache(skillsBase);
return skillsBase;
}
public void LOAD_ALL_MAX_SKILLS_FOR_CONTRACT() {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_rune_maxskills`")) {
ResultSet rs = preparedStatement.executeQuery();
while (rs.next()) {
MaxSkills maxSKills = new MaxSkills(rs);
if (MaxSkills.MaxSkillsSet.get(maxSKills.getRuneID()) == null) {
ArrayList<MaxSkills> newMaxSkillsList = new ArrayList<>();
newMaxSkillsList.add(maxSKills);
MaxSkills.MaxSkillsSet.put(maxSKills.getRuneID(), newMaxSkillsList);
} else
MaxSkills.MaxSkillsSet.get(maxSKills.getRuneID()).add(maxSKills);
}
} catch (SQLException e) {
Logger.error(e);
}
}
public void LOAD_ALL_RUNE_SKILLS() {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_skill_skillsgranted`")) {
ResultSet rs = preparedStatement.executeQuery();
while (rs.next()) {
int runeID = rs.getInt("runeID");
int token = rs.getInt("token");
int amount = rs.getInt("amount");
if (SkillsBase.runeSkillsCache.get(runeID) == null)
SkillsBase.runeSkillsCache.put(runeID, new HashMap<>());
SkillsBase.runeSkillsCache.get(runeID).put(token, amount);
}
} catch (SQLException e) {
Logger.error(e);
}
}
}
src/engine/db/handlers/dbSkillReqHandler.java
-20
View File
@@ -76,24 +76,4 @@ public class dbSkillReqHandler extends dbHandlerBase {
Logger.error(e);
}
}
public ArrayList<SkillReq> GET_REQS_FOR_RUNE(final int objectUUID) {
ArrayList<SkillReq> skillReqsList = new ArrayList<>();
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_skill_skillreq` WHERE `runeID`=?")) {
preparedStatement.setInt(1, objectUUID);
ResultSet rs = preparedStatement.executeQuery();
skillReqsList = getObjectsFromRs(rs, 5);
} catch (SQLException e) {
Logger.error(e);
}
return skillReqsList;
}
}
src/engine/objects/MaxSkills.java
-13
View File
@@ -14,8 +14,6 @@ import engine.parsers.objects.RuneTemplate;
import engine.util.Hasher;
import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -29,17 +27,6 @@ public class MaxSkills {
private int maxSkillPercent;
/**
* ResultSet Constructor
*/
public MaxSkills(ResultSet rs) throws SQLException {
this.runeID = rs.getInt("runeID");
this.skillToken = rs.getInt("skillToken");
this.skillLevel = rs.getInt("skillLevel");
this.maxSkillPercent = rs.getInt("maxSkillPercent");
}
public MaxSkills(int runeID, int skillToken, int skillLevel, int maxSkillPercent) {
super();
this.runeID = runeID;
src/engine/objects/PowerGrantedTrains.java
-48
View File
@@ -9,17 +9,12 @@
package engine.objects;
import engine.gameManager.DbManager;
import engine.mbEnums;
import engine.parsers.objects.RuneTemplate;
import engine.server.MBServerStatics;
import engine.util.Hasher;
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;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -31,14 +26,6 @@ public class PowerGrantedTrains {
private int token;
private ConcurrentHashMap<Integer, Short> runeGrants = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
/**
* ResultSet Constructor
*/
public PowerGrantedTrains(ResultSet rs) throws SQLException {
this.token = rs.getInt("powerToken");
runeGrants.put(rs.getInt("runeID"), rs.getShort("grantAmount"));
}
public PowerGrantedTrains(int token) {
this.token = token;
}
@@ -124,41 +111,6 @@ public class PowerGrantedTrains {
Logger.info("Loaded " + grantCount + " power train grants for " + powerGrants.size() + " powers");
}
public static void fillGrantedPowers() {
PowerGrantedTrains.grantedPowers = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_powergrant")) {
ResultSet rs = preparedStatement.executeQuery();
if (PowerGrantedTrains.grantedPowers.size() > 0) {
rs.close();
return;
}
while (rs.next()) {
int token = rs.getInt("powerToken");
PowerGrantedTrains pg;
if (PowerGrantedTrains.grantedPowers.containsKey(token)) {
pg = PowerGrantedTrains.grantedPowers.get(token);
pg.addRuneGrant(rs.getInt("runeID"), rs.getShort("grantAmount"));
} else {
pg = new PowerGrantedTrains(rs);
PowerGrantedTrains.grantedPowers.put(token, pg);
}
}
rs.close();
} catch (SQLException e) {
Logger.error("SQL Error number: " + e.getErrorCode(), e);
}
}
/*
* Database
*/
src/engine/objects/SkillReq.java
+2 -30
View File
@@ -14,8 +14,6 @@ import engine.parsers.objects.RuneTemplate;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -24,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class SkillReq extends AbstractGameObject {
private static final int DB_SKILL_REQ_AMOUNT = 80;
private static final int DEFAULT_SKILL_REQ_AMOUNT = 80;
private static final ConcurrentHashMap<Integer, ArrayList<SkillReq>> skillReqsByRune = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
private int skillID;
@@ -61,32 +59,6 @@ public class SkillReq extends AbstractGameObject {
}
*/
/**
* ResultSet Constructor
*/
public SkillReq(ResultSet rs) throws SQLException {
super(rs, 0);
this.skillID = rs.getInt("skillID");
this.level = rs.getShort("level");
skillReqs = new ArrayList<>(0);
skillReqAmounts = new HashMap<>();
int skillReq;
skillReq = rs.getInt("skillreq1");
if (skillReq > 0)
skillReqs.add((byte) skillReq);
skillReq = rs.getInt("skillreq2");
if (skillReq > 0)
skillReqs.add((byte) skillReq);
skillReq = rs.getInt("skillreq3");
if (skillReq > 0)
skillReqs.add((byte) skillReq);
// DB rows carry no amount; the server hard-codes 80
for (byte reqSkillID : skillReqs)
skillReqAmounts.put(reqSkillID, DB_SKILL_REQ_AMOUNT);
}
// skill_value is the level the skill is granted at; skill_granted_skills are prereq skills with amounts
public SkillReq(RuneTemplate.SkillGrant skillGrant, SkillsBase skillsBase, int runeID) {
super();
@@ -165,7 +137,7 @@ public class SkillReq extends AbstractGameObject {
}
public int getSkillReqAmount(byte reqSkillID) {
return this.skillReqAmounts.getOrDefault(reqSkillID, DB_SKILL_REQ_AMOUNT);
return this.skillReqAmounts.getOrDefault(reqSkillID, DEFAULT_SKILL_REQ_AMOUNT);
}
src/engine/powers/RuneSkillAdjustEntry.java
-10
View File
@@ -12,8 +12,6 @@ import engine.parsers.objects.RuneTemplate;
import engine.util.Hasher;
import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -27,14 +25,6 @@ public class RuneSkillAdjustEntry {
public int level;
public RuneSkillAdjustEntry(ResultSet rs) throws SQLException {
this.name = rs.getString("name");
this.token = rs.getInt("token");
this.skill_type = rs.getString("skill_type");
this.rank = rs.getInt("rank");
this.level = rs.getInt("level");
}
public RuneSkillAdjustEntry(RuneTemplate rune, String skillType, int[] adjust) {
this.name = rune.obj_name;
this.token = Hasher.SBStringHash(skillType);