diff --git a/src/engine/objects/CharacterPower.java b/src/engine/objects/CharacterPower.java index 2e6a16ae..37596d6f 100644 --- a/src/engine/objects/CharacterPower.java +++ b/src/engine/objects/CharacterPower.java @@ -334,7 +334,7 @@ public class CharacterPower extends AbstractGameObject { // return pc.getBonuses().getByte("gt." + this.power.getToken()); // } else // return pc.getBonuses().getByte("gt." + this.power.getToken()); - return PowerGrant.getGrantedTrains(this.power.getToken(), pc); + return PowerGrantedTrains.getGrantedTrains(this.power.getToken(), pc); } else return 0; } diff --git a/src/engine/objects/PowerGrant.java b/src/engine/objects/PowerGrantedTrains.java similarity index 80% rename from src/engine/objects/PowerGrant.java rename to src/engine/objects/PowerGrantedTrains.java index 2bd476ad..91920930 100644 --- a/src/engine/objects/PowerGrant.java +++ b/src/engine/objects/PowerGrantedTrains.java @@ -21,17 +21,16 @@ import java.util.ArrayList; import java.util.concurrent.ConcurrentHashMap; -public class PowerGrant extends AbstractGameObject { +public class PowerGrantedTrains { - private static ConcurrentHashMap grantedPowers = null; + private static ConcurrentHashMap grantedPowers = null; private int token; private ConcurrentHashMap runeGrants = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); /** * ResultSet Constructor */ - public PowerGrant(ResultSet rs) throws SQLException { - super(); + public PowerGrantedTrains(ResultSet rs) throws SQLException { this.token = rs.getInt("powerToken"); runeGrants.put(rs.getInt("runeID"), rs.getShort("grantAmount")); } @@ -44,11 +43,11 @@ public class PowerGrant extends AbstractGameObject { if (pc == null) return (short) 0; - if (PowerGrant.grantedPowers == null) + if (PowerGrantedTrains.grantedPowers == null) fillGrantedPowers(); - if (PowerGrant.grantedPowers.containsKey(token)) { - PowerGrant pg = PowerGrant.grantedPowers.get(token); + if (PowerGrantedTrains.grantedPowers.containsKey(token)) { + PowerGrantedTrains pg = PowerGrantedTrains.grantedPowers.get(token); ConcurrentHashMap runeGrants = pg.runeGrants; ArrayList toks = new ArrayList<>(); @@ -90,7 +89,7 @@ public class PowerGrant extends AbstractGameObject { public static void fillGrantedPowers() { - PowerGrant.grantedPowers = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); + 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")) { @@ -98,7 +97,7 @@ public class PowerGrant extends AbstractGameObject { ResultSet rs = preparedStatement.executeQuery(); - if (PowerGrant.grantedPowers.size() > 0) { + if (PowerGrantedTrains.grantedPowers.size() > 0) { rs.close(); return; } @@ -107,14 +106,14 @@ public class PowerGrant extends AbstractGameObject { int token = rs.getInt("powerToken"); - PowerGrant pg; + PowerGrantedTrains pg; - if (PowerGrant.grantedPowers.containsKey(token)) { - pg = PowerGrant.grantedPowers.get(token); + if (PowerGrantedTrains.grantedPowers.containsKey(token)) { + pg = PowerGrantedTrains.grantedPowers.get(token); pg.addRuneGrant(rs.getInt("runeID"), rs.getShort("grantAmount")); } else { - pg = new PowerGrant(rs); - PowerGrant.grantedPowers.put(token, pg); + pg = new PowerGrantedTrains(rs); + PowerGrantedTrains.grantedPowers.put(token, pg); } } rs.close(); @@ -134,8 +133,4 @@ public class PowerGrant extends AbstractGameObject { private void addRuneGrant(int runeID, short amount) { this.runeGrants.put(runeID, amount); } - - @Override - public void updateDatabase() { - } }