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/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);
}