From 025a451770a2edaac8e738148ed8cadd03a054a0 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 26 Oct 2026 09:41:17 -0400 Subject: [PATCH] Remove the DB power action loader Power actions come from PowerActions.cfg (3fc5e725, tested). Deletes AbstractPowerAction.getAllPowerActions and the ResultSet constructor on every power action class. static_power_poweraction is dropped. Co-Authored-By: Claude Opus 5.5 --- .../poweractions/AbstractPowerAction.java | 153 ------------------ .../poweractions/ApplyEffectPowerAction.java | 10 -- .../poweractions/ApplyEffectsPowerAction.java | 13 -- .../powers/poweractions/BlockPowerAction.java | 7 - .../powers/poweractions/CharmPowerAction.java | 9 -- .../poweractions/ClaimMinePowerAction.java | 7 - .../poweractions/ClearAggroPowerAction.java | 7 - .../ClearNearbyAggroPowerAction.java | 7 - .../poweractions/ConfusionPowerAction.java | 7 - .../poweractions/CreateMobPowerAction.java | 9 -- .../DamageOverTimePowerAction.java | 10 -- .../DeferredPowerPowerAction.java | 10 -- .../poweractions/DirectDamagePowerAction.java | 9 -- .../powers/poweractions/FearPowerAction.java | 8 - .../powers/poweractions/InvisPowerAction.java | 9 -- .../poweractions/MobRecallPowerAction.java | 7 - .../poweractions/OpenGatePowerAction.java | 9 -- .../powers/poweractions/PeekPowerAction.java | 6 - .../poweractions/RecallPowerAction.java | 7 - .../poweractions/RemoveEffectPowerAction.java | 11 -- .../poweractions/ResurrectPowerAction.java | 7 - .../RunegateTeleportPowerAction.java | 9 -- .../poweractions/SetItemFlagPowerAction.java | 7 - .../poweractions/SimpleDamagePowerAction.java | 7 - .../poweractions/SpireDisablePowerAction.java | 9 -- .../powers/poweractions/StealPowerAction.java | 9 -- .../poweractions/SummonPowerAction.java | 9 -- .../poweractions/TeleportPowerAction.java | 10 -- .../powers/poweractions/TrackPowerAction.java | 21 --- .../TransferStatOTPowerAction.java | 8 - .../poweractions/TransferStatPowerAction.java | 39 ----- .../poweractions/TransformPowerAction.java | 9 -- .../poweractions/TreeChokePowerAction.java | 7 - 33 files changed, 466 deletions(-) diff --git a/src/engine/powers/poweractions/AbstractPowerAction.java b/src/engine/powers/poweractions/AbstractPowerAction.java index 49a0c17b..63005aba 100644 --- a/src/engine/powers/poweractions/AbstractPowerAction.java +++ b/src/engine/powers/poweractions/AbstractPowerAction.java @@ -9,8 +9,6 @@ package engine.powers.poweractions; -import engine.gameManager.DbManager; -import engine.gameManager.PowersManager; import engine.math.Vector3fImmutable; import engine.objects.AbstractCharacter; import engine.objects.AbstractWorldObject; @@ -19,13 +17,6 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import org.pmw.tinylog.Logger; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.HashMap; public abstract class AbstractPowerAction { @@ -43,18 +34,6 @@ public abstract class AbstractPowerAction { } - /** - * ResultSet Constructor - */ - public AbstractPowerAction(ResultSet rs) throws SQLException { - - this.UUID = rs.getInt("ID"); - this.IDString = rs.getString("IDString"); - this.type = rs.getString("type"); - int flags = rs.getInt("flags"); - this.isAggressive = ((flags & 128) != 0) ? true : false; - } - public AbstractPowerAction(PowerActionTemplate powerActionTemplate, int id) { this.UUID = id; this.IDString = powerActionTemplate.action_id; @@ -75,138 +54,6 @@ public abstract class AbstractPowerAction { this.isAggressive = false; } - public static void getAllPowerActions(HashMap powerActions, HashMap powerActionsByID, HashMap effects) { - - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_poweraction")) { - - ResultSet rs = preparedStatement.executeQuery(); - String IDString, type; - - while (rs.next()) { - AbstractPowerAction apa; - type = rs.getString("type"); - IDString = rs.getString("IDString"); - int token = DbManager.hasher.SBStringHash(IDString); - //cache token, used for applying effects. - PowersManager.ActionTokenByIDString.put(IDString, token); - apa = null; - switch (type) { - default: - Logger.error("valid type not found for poweraction of ID" + rs.getInt("ID")); - break; - case "ApplyEffect": - apa = new ApplyEffectPowerAction(rs, effects); - break; - case "ApplyEffects": - apa = new ApplyEffectsPowerAction(rs, effects); - break; - case "DeferredPower": - apa = new DeferredPowerPowerAction(rs, effects); - break; - case "DamageOverTime": - apa = new DamageOverTimePowerAction(rs, effects); - break; - case "Peek": - apa = new PeekPowerAction(rs); - break; - case "Charm": - apa = new CharmPowerAction(rs); - break; - case "Fear": - apa = new FearPowerAction(rs); - break; - case "Confusion": - apa = new ConfusionPowerAction(rs); - break; - case "RemoveEffect": - apa = new RemoveEffectPowerAction(rs); - break; - case "Track": - apa = new TrackPowerAction(rs, effects); - break; - case "DirectDamage": - apa = new DirectDamagePowerAction(rs, effects); - break; - case "Transform": - apa = new TransformPowerAction(rs, effects); - break; - case "CreateMob": - apa = new CreateMobPowerAction(rs); - break; - case "Invis": - apa = new InvisPowerAction(rs, effects); - break; - case "ClearNearbyAggro": - apa = new ClearNearbyAggroPowerAction(rs); - break; - case "MobRecall": - apa = new MobRecallPowerAction(rs); - break; - case "SetItemFlag": - apa = new SetItemFlagPowerAction(rs); - break; - case "SimpleDamage": - apa = new SimpleDamagePowerAction(rs); - break; - case "TransferStatOT": - apa = new TransferStatOTPowerAction(rs, effects); - break; - case "TransferStat": - apa = new TransferStatPowerAction(rs, effects); - break; - case "Teleport": - apa = new TeleportPowerAction(rs); - break; - case "TreeChoke": - apa = new TreeChokePowerAction(rs); - break; - case "Block": - apa = new BlockPowerAction(rs); - break; - case "Resurrect": - apa = new ResurrectPowerAction(rs); - break; - case "ClearAggro": - apa = new ClearAggroPowerAction(rs); - break; - case "ClaimMine": - apa = new ClaimMinePowerAction(rs); - break; - case "Recall": - apa = new RecallPowerAction(rs); - break; - case "SpireDisable": - apa = new SpireDisablePowerAction(rs); - break; - case "Steal": - apa = new StealPowerAction(rs); - break; - case "Summon": - apa = new SummonPowerAction(rs); - break; - case "RunegateTeleport": - apa = new RunegateTeleportPowerAction(rs); - break; - case "OpenGate": - apa = new OpenGatePowerAction(rs); - break; - } - powerActions.put(IDString, apa); - powerActionsByID.put(apa.UUID, apa); - } - rs.close(); - } catch (Exception e) { - Logger.error(e.toString()); - } - - //Add OpenGatePowerAction - AbstractPowerAction openGateAction = new OpenGatePowerAction(5000, "OPENGATE", "OpenGate", false); - powerActions.put("OPENGATE", openGateAction); - powerActionsByID.put(openGateAction.UUID, openGateAction); - } - public void startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int numTrains, ActionsBase ab, PowersBase pb) { this._startAction(source, awo, targetLoc, numTrains, ab, pb); } diff --git a/src/engine/powers/poweractions/ApplyEffectPowerAction.java b/src/engine/powers/poweractions/ApplyEffectPowerAction.java index 337eac71..9184ba9a 100644 --- a/src/engine/powers/poweractions/ApplyEffectPowerAction.java +++ b/src/engine/powers/poweractions/ApplyEffectPowerAction.java @@ -28,8 +28,6 @@ import engine.powers.PowersBase; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; public class ApplyEffectPowerAction extends AbstractPowerAction { @@ -39,14 +37,6 @@ public class ApplyEffectPowerAction extends AbstractPowerAction { private String effectParentID; private EffectsBase effectParent; - public ApplyEffectPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - this.effectParentID = rs.getString("IDString"); - this.effectParent = effects.get(this.effectParentID); - this.effectID = rs.getString("effectID"); - this.effect = effects.get(this.effectID); - } - public ApplyEffectPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); this.effectParentID = powerActionTemplate.action_id; diff --git a/src/engine/powers/poweractions/ApplyEffectsPowerAction.java b/src/engine/powers/poweractions/ApplyEffectsPowerAction.java index 51ee78da..874862c1 100644 --- a/src/engine/powers/poweractions/ApplyEffectsPowerAction.java +++ b/src/engine/powers/poweractions/ApplyEffectsPowerAction.java @@ -20,8 +20,6 @@ import engine.powers.EffectsBase; import engine.powers.PowersBase; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -33,17 +31,6 @@ public class ApplyEffectsPowerAction extends AbstractPowerAction { private EffectsBase effect2; private EffectsBase effectParent; - public ApplyEffectsPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - this.IDString = rs.getString("IDString"); - this.effectID = rs.getString("effectID"); - this.effectID2 = rs.getString("effectID2"); - this.effect = effects.get(this.effectID); - this.effect2 = effects.get(this.effectID2); - this.effectParent = effects.get(this.IDString); - - } - public ApplyEffectsPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); this.IDString = powerActionTemplate.action_id; diff --git a/src/engine/powers/poweractions/BlockPowerAction.java b/src/engine/powers/poweractions/BlockPowerAction.java index a79fdac0..112767e5 100644 --- a/src/engine/powers/poweractions/BlockPowerAction.java +++ b/src/engine/powers/poweractions/BlockPowerAction.java @@ -16,16 +16,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class BlockPowerAction extends AbstractPowerAction { - public BlockPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public BlockPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/CharmPowerAction.java b/src/engine/powers/poweractions/CharmPowerAction.java index f16fee62..09e37fcd 100644 --- a/src/engine/powers/poweractions/CharmPowerAction.java +++ b/src/engine/powers/poweractions/CharmPowerAction.java @@ -21,21 +21,12 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CharmPowerAction extends AbstractPowerAction { private int levelCap; private float levelCapRamp; - public CharmPowerAction(ResultSet rs) throws SQLException { - super(rs); - this.levelCap = rs.getInt("levelCap"); - this.levelCapRamp = rs.getFloat("levelCapRamp"); - } - public CharmPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); CurveRamp curveRamp = (powerActionTemplate.levelcap_curve == null) ? null : CurveRamp.fromCurve(powerActionTemplate.levelcap_curve); diff --git a/src/engine/powers/poweractions/ClaimMinePowerAction.java b/src/engine/powers/poweractions/ClaimMinePowerAction.java index 561634d7..86bb17e6 100644 --- a/src/engine/powers/poweractions/ClaimMinePowerAction.java +++ b/src/engine/powers/poweractions/ClaimMinePowerAction.java @@ -17,16 +17,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ClaimMinePowerAction extends AbstractPowerAction { - public ClaimMinePowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public ClaimMinePowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/ClearAggroPowerAction.java b/src/engine/powers/poweractions/ClearAggroPowerAction.java index ca48d864..bcd4831b 100644 --- a/src/engine/powers/poweractions/ClearAggroPowerAction.java +++ b/src/engine/powers/poweractions/ClearAggroPowerAction.java @@ -18,16 +18,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ClearAggroPowerAction extends AbstractPowerAction { - public ClearAggroPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public ClearAggroPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java b/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java index ab7e2017..e6fb540a 100644 --- a/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java +++ b/src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java @@ -17,16 +17,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ClearNearbyAggroPowerAction extends AbstractPowerAction { - public ClearNearbyAggroPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public ClearNearbyAggroPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/ConfusionPowerAction.java b/src/engine/powers/poweractions/ConfusionPowerAction.java index 8a13eb76..1dd4c6a4 100644 --- a/src/engine/powers/poweractions/ConfusionPowerAction.java +++ b/src/engine/powers/poweractions/ConfusionPowerAction.java @@ -16,16 +16,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ConfusionPowerAction extends AbstractPowerAction { - public ConfusionPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public ConfusionPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/CreateMobPowerAction.java b/src/engine/powers/poweractions/CreateMobPowerAction.java index eb81aefd..deeb6698 100644 --- a/src/engine/powers/poweractions/CreateMobPowerAction.java +++ b/src/engine/powers/poweractions/CreateMobPowerAction.java @@ -25,8 +25,6 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -52,13 +50,6 @@ public class CreateMobPowerAction extends AbstractPowerAction { MOBBASE_BY_CLIENT_MOB_ID.put(3501, 11998); } - public CreateMobPowerAction(ResultSet rs) throws SQLException { - super(rs); - - this.mobID = rs.getInt("mobID"); - this.mobLevel = rs.getInt("mobLevel"); - } - public CreateMobPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/DamageOverTimePowerAction.java b/src/engine/powers/poweractions/DamageOverTimePowerAction.java index df87c845..951134da 100644 --- a/src/engine/powers/poweractions/DamageOverTimePowerAction.java +++ b/src/engine/powers/poweractions/DamageOverTimePowerAction.java @@ -18,8 +18,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -29,14 +27,6 @@ public class DamageOverTimePowerAction extends AbstractPowerAction { private int numIterations; private EffectsBase effect; - public DamageOverTimePowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - - this.effectID = rs.getString("effectID"); - this.numIterations = rs.getInt("numIterations"); - this.effect = effects.get(this.effectID); - } - public DamageOverTimePowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/DeferredPowerPowerAction.java b/src/engine/powers/poweractions/DeferredPowerPowerAction.java index a1dce2f9..2bcacfa1 100644 --- a/src/engine/powers/poweractions/DeferredPowerPowerAction.java +++ b/src/engine/powers/poweractions/DeferredPowerPowerAction.java @@ -20,8 +20,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -32,14 +30,6 @@ public class DeferredPowerPowerAction extends AbstractPowerAction { private EffectsBase effect; // private EffectsBase deferedPower; - public DeferredPowerPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - - this.effectID = rs.getString("effectID"); - this.deferedPowerID = rs.getString("deferredPowerID"); - this.effect = effects.get(this.effectID); - } - public DeferredPowerPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/DirectDamagePowerAction.java b/src/engine/powers/poweractions/DirectDamagePowerAction.java index e24b89bf..1f411273 100644 --- a/src/engine/powers/poweractions/DirectDamagePowerAction.java +++ b/src/engine/powers/poweractions/DirectDamagePowerAction.java @@ -19,8 +19,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -29,13 +27,6 @@ public class DirectDamagePowerAction extends AbstractPowerAction { private String effectID; private EffectsBase effect; - public DirectDamagePowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - - this.effectID = rs.getString("effectID"); - this.effect = effects.get(this.effectID); - } - public DirectDamagePowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/FearPowerAction.java b/src/engine/powers/poweractions/FearPowerAction.java index 97e8d8c5..bd79236c 100644 --- a/src/engine/powers/poweractions/FearPowerAction.java +++ b/src/engine/powers/poweractions/FearPowerAction.java @@ -23,20 +23,12 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; public class FearPowerAction extends AbstractPowerAction { private int levelCap; private float levelCapRamp; - public FearPowerAction(ResultSet rs) throws SQLException { - super(rs); - this.levelCap = rs.getInt("levelCap"); - this.levelCapRamp = rs.getFloat("levelCapRamp"); - } - public FearPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); CurveRamp curveRamp = (powerActionTemplate.levelcap_curve == null) ? null : CurveRamp.fromCurve(powerActionTemplate.levelcap_curve); diff --git a/src/engine/powers/poweractions/InvisPowerAction.java b/src/engine/powers/poweractions/InvisPowerAction.java index 8282a40c..909f9cb4 100644 --- a/src/engine/powers/poweractions/InvisPowerAction.java +++ b/src/engine/powers/poweractions/InvisPowerAction.java @@ -18,8 +18,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -28,13 +26,6 @@ public class InvisPowerAction extends AbstractPowerAction { private String effectID; private EffectsBase effect; - public InvisPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - - this.effectID = rs.getString("effectID"); - this.effect = effects.get(this.effectID); - } - public InvisPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/MobRecallPowerAction.java b/src/engine/powers/poweractions/MobRecallPowerAction.java index a351ed58..fcab9eec 100644 --- a/src/engine/powers/poweractions/MobRecallPowerAction.java +++ b/src/engine/powers/poweractions/MobRecallPowerAction.java @@ -19,16 +19,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class MobRecallPowerAction extends AbstractPowerAction { - public MobRecallPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public MobRecallPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/OpenGatePowerAction.java b/src/engine/powers/poweractions/OpenGatePowerAction.java index 1e8d7248..b040b93e 100644 --- a/src/engine/powers/poweractions/OpenGatePowerAction.java +++ b/src/engine/powers/poweractions/OpenGatePowerAction.java @@ -21,18 +21,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; public class OpenGatePowerAction extends AbstractPowerAction { - /** - * ResultSet Constructor - */ - public OpenGatePowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public OpenGatePowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/PeekPowerAction.java b/src/engine/powers/poweractions/PeekPowerAction.java index 2a32d187..bda6c174 100644 --- a/src/engine/powers/poweractions/PeekPowerAction.java +++ b/src/engine/powers/poweractions/PeekPowerAction.java @@ -20,17 +20,11 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.ThreadLocalRandom; public class PeekPowerAction extends AbstractPowerAction { - public PeekPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public PeekPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/RecallPowerAction.java b/src/engine/powers/poweractions/RecallPowerAction.java index db008adc..391f681f 100644 --- a/src/engine/powers/poweractions/RecallPowerAction.java +++ b/src/engine/powers/poweractions/RecallPowerAction.java @@ -27,16 +27,9 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.server.MBServerStatics; -import java.sql.ResultSet; -import java.sql.SQLException; - public class RecallPowerAction extends AbstractPowerAction { - public RecallPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public RecallPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/RemoveEffectPowerAction.java b/src/engine/powers/poweractions/RemoveEffectPowerAction.java index ae3a9195..261e1590 100644 --- a/src/engine/powers/poweractions/RemoveEffectPowerAction.java +++ b/src/engine/powers/poweractions/RemoveEffectPowerAction.java @@ -17,9 +17,6 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class RemoveEffectPowerAction extends AbstractPowerAction { @@ -27,14 +24,6 @@ public class RemoveEffectPowerAction extends AbstractPowerAction { public EffectSourceType sourceType; private boolean removeAll; - public RemoveEffectPowerAction(ResultSet rs) throws SQLException { - super(rs); - String effectTypeToRemove = rs.getString("effectSourceToRemove").replace("-", "").trim(); - sourceType = EffectSourceType.GetEffectSourceType(effectTypeToRemove); - int flags = rs.getInt("flags"); - this.removeAll = ((flags & 2) != 0) ? true : false; - } - public RemoveEffectPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); String effectTypeToRemove = powerActionTemplate.effect_source_to_remove.replace("-", "").trim(); diff --git a/src/engine/powers/poweractions/ResurrectPowerAction.java b/src/engine/powers/poweractions/ResurrectPowerAction.java index 1cbe6643..36a05631 100644 --- a/src/engine/powers/poweractions/ResurrectPowerAction.java +++ b/src/engine/powers/poweractions/ResurrectPowerAction.java @@ -16,16 +16,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ResurrectPowerAction extends AbstractPowerAction { - public ResurrectPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public ResurrectPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/RunegateTeleportPowerAction.java b/src/engine/powers/poweractions/RunegateTeleportPowerAction.java index 58724028..1505acf6 100644 --- a/src/engine/powers/poweractions/RunegateTeleportPowerAction.java +++ b/src/engine/powers/poweractions/RunegateTeleportPowerAction.java @@ -19,21 +19,12 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import static engine.math.FastMath.sqr; import static engine.math.FastMath.sqrt; public class RunegateTeleportPowerAction extends AbstractPowerAction { - /** - * ResultSet Constructor - */ - public RunegateTeleportPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public RunegateTeleportPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/SetItemFlagPowerAction.java b/src/engine/powers/poweractions/SetItemFlagPowerAction.java index 3ad5670d..bb2b6e9e 100644 --- a/src/engine/powers/poweractions/SetItemFlagPowerAction.java +++ b/src/engine/powers/poweractions/SetItemFlagPowerAction.java @@ -20,16 +20,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SetItemFlagPowerAction extends AbstractPowerAction { - public SetItemFlagPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public SetItemFlagPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/SimpleDamagePowerAction.java b/src/engine/powers/poweractions/SimpleDamagePowerAction.java index f6e1d40c..63d48ce8 100644 --- a/src/engine/powers/poweractions/SimpleDamagePowerAction.java +++ b/src/engine/powers/poweractions/SimpleDamagePowerAction.java @@ -16,19 +16,12 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SimpleDamagePowerAction extends AbstractPowerAction { private float minDamage; private float maxDamage; - public SimpleDamagePowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public SimpleDamagePowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/SpireDisablePowerAction.java b/src/engine/powers/poweractions/SpireDisablePowerAction.java index 2d81cd9c..8bb44e8f 100644 --- a/src/engine/powers/poweractions/SpireDisablePowerAction.java +++ b/src/engine/powers/poweractions/SpireDisablePowerAction.java @@ -21,18 +21,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; public class SpireDisablePowerAction extends AbstractPowerAction { - /** - * ResultSet Constructor - */ - public SpireDisablePowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public SpireDisablePowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/StealPowerAction.java b/src/engine/powers/poweractions/StealPowerAction.java index 4df47c5d..b812d4e8 100644 --- a/src/engine/powers/poweractions/StealPowerAction.java +++ b/src/engine/powers/poweractions/StealPowerAction.java @@ -24,8 +24,6 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import engine.server.MBServerStatics; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.ThreadLocalRandom; import static engine.math.FastMath.sqr; @@ -33,13 +31,6 @@ import static engine.math.FastMath.sqr; public class StealPowerAction extends AbstractPowerAction { - /** - * ResultSet Constructor - */ - public StealPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public StealPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/SummonPowerAction.java b/src/engine/powers/poweractions/SummonPowerAction.java index a0379af7..c363e7f8 100644 --- a/src/engine/powers/poweractions/SummonPowerAction.java +++ b/src/engine/powers/poweractions/SummonPowerAction.java @@ -25,18 +25,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; public class SummonPowerAction extends AbstractPowerAction { - /** - * ResultSet Constructor - */ - public SummonPowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public SummonPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); } diff --git a/src/engine/powers/poweractions/TeleportPowerAction.java b/src/engine/powers/poweractions/TeleportPowerAction.java index 067c8237..cf76b27c 100644 --- a/src/engine/powers/poweractions/TeleportPowerAction.java +++ b/src/engine/powers/poweractions/TeleportPowerAction.java @@ -23,21 +23,11 @@ import engine.powers.PowersBase; import engine.powers.effectmodifiers.AbstractEffectModifier; import engine.server.MBServerStatics; -import java.sql.ResultSet; -import java.sql.SQLException; - public class TeleportPowerAction extends AbstractPowerAction { private boolean ignoreNoTeleSpire; - public TeleportPowerAction(ResultSet rs) throws SQLException { - super(rs); - - int flags = rs.getInt("flags"); - this.ignoreNoTeleSpire = ((flags & 32768) != 0) ? true : false; - } - public TeleportPowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/TrackPowerAction.java b/src/engine/powers/poweractions/TrackPowerAction.java index 1f948672..6488475b 100644 --- a/src/engine/powers/poweractions/TrackPowerAction.java +++ b/src/engine/powers/poweractions/TrackPowerAction.java @@ -19,8 +19,6 @@ import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.server.MBServerStatics; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -38,25 +36,6 @@ public class TrackPowerAction extends AbstractPowerAction { private int maxTrack; private EffectsBase effect; - public TrackPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - - this.effectID = rs.getString("effectID"); - int flags = rs.getInt("flags"); - this.trackPlayer = ((flags & 1024) != 0) ? true : false; - this.trackCorpse = ((flags & 2048) != 0) ? true : false; - String trackFilter = rs.getString("trackFilter"); - this.trackAll = trackFilter.equals("All") ? true : false; - this.trackDragon = trackFilter.equals("Dragon") ? true : false; - this.trackGiant = trackFilter.equals("Giant") ? true : false; - this.trackNPC = trackFilter.equals("NPC") ? true : false; - this.trackUndead = trackFilter.equals("Undead") ? true : false; - this.trackVampire = trackFilter.equals("Vampire") ? true : false; - - this.maxTrack = rs.getInt("maxTrack"); - this.effect = effects.get(this.effectID); - } - public TrackPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/TransferStatOTPowerAction.java b/src/engine/powers/poweractions/TransferStatOTPowerAction.java index c05a78b9..d7ad5bf2 100644 --- a/src/engine/powers/poweractions/TransferStatOTPowerAction.java +++ b/src/engine/powers/poweractions/TransferStatOTPowerAction.java @@ -19,8 +19,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -28,12 +26,6 @@ public class TransferStatOTPowerAction extends TransferStatPowerAction { private int numIterations; - public TransferStatOTPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs, effects); - - this.numIterations = rs.getInt("numIterations"); - } - public TransferStatOTPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id, effects); diff --git a/src/engine/powers/poweractions/TransferStatPowerAction.java b/src/engine/powers/poweractions/TransferStatPowerAction.java index 6ae92ab6..cceb65c8 100644 --- a/src/engine/powers/poweractions/TransferStatPowerAction.java +++ b/src/engine/powers/poweractions/TransferStatPowerAction.java @@ -25,8 +25,6 @@ import engine.powers.EffectsBase; import engine.powers.PowersBase; import engine.powers.effectmodifiers.HealthEffectModifier; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; import java.util.concurrent.ThreadLocalRandom; @@ -49,43 +47,6 @@ public class TransferStatPowerAction extends AbstractPowerAction { protected mbEnums.DamageType damageType; protected EffectsBase effect; - public TransferStatPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - this.effectID = rs.getString("effectID"); - String st = rs.getString("transferFromType"); - if (st.equals("HEALTH")) - this.transferFromHealth = true; - else if (st.equals("MANA")) - this.transferFromMana = true; - else - this.transferFromStamina = true; - st = rs.getString("transferToType"); - if (st.equals("HEALTH")) - this.transferToHealth = true; - else if (st.equals("MANA")) - this.transferToMana = true; - else - this.transferToStamina = true; - this.transferAmount = rs.getFloat("transferAmount"); - this.transferRamp = rs.getFloat("transferRamp"); - this.transferEfficiency = rs.getFloat("transferEfficiency"); - this.transferEfficiencyRamp = rs.getFloat("transferEfficiencyRamp"); - int flags = rs.getInt("flags"); - this.transferRampAdd = ((flags & 4096) != 0) ? true : false; - this.transferEfficiencyRampAdd = ((flags & 8192) != 0) ? true : false; - this.targetToCaster = ((flags & 16384) != 0) ? true : false; - this.effect = effects.get(this.effectID); - try { - String damageString = rs.getString("damageType"); - // Damage type can sometimes be null in the DB. - - if (damageString.isEmpty() == false) - this.damageType = mbEnums.DamageType.getDamageType(damageString); - } catch (Exception e) { - this.damageType = null; - } - } - public TransferStatPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); CurveRamp amountRamp = CurveRamp.fromCurve(powerActionTemplate.transfer_amount_curve); diff --git a/src/engine/powers/poweractions/TransformPowerAction.java b/src/engine/powers/poweractions/TransformPowerAction.java index 09ebf974..368c3afa 100644 --- a/src/engine/powers/poweractions/TransformPowerAction.java +++ b/src/engine/powers/poweractions/TransformPowerAction.java @@ -18,8 +18,6 @@ import engine.powers.ActionsBase; import engine.powers.EffectsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashMap; @@ -28,13 +26,6 @@ public class TransformPowerAction extends AbstractPowerAction { private String effectID; private EffectsBase effect; - public TransformPowerAction(ResultSet rs, HashMap effects) throws SQLException { - super(rs); - - this.effectID = rs.getString("effectID"); - this.effect = effects.get(this.effectID); - } - public TransformPowerAction(PowerActionTemplate powerActionTemplate, int id, HashMap effects) { super(powerActionTemplate, id); diff --git a/src/engine/powers/poweractions/TreeChokePowerAction.java b/src/engine/powers/poweractions/TreeChokePowerAction.java index 4dc801e3..d4e890c4 100644 --- a/src/engine/powers/poweractions/TreeChokePowerAction.java +++ b/src/engine/powers/poweractions/TreeChokePowerAction.java @@ -16,16 +16,9 @@ import engine.parsers.objects.wpak.PowerActionTemplate; import engine.powers.ActionsBase; import engine.powers.PowersBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class TreeChokePowerAction extends AbstractPowerAction { - public TreeChokePowerAction(ResultSet rs) throws SQLException { - super(rs); - } - public TreeChokePowerAction(PowerActionTemplate powerActionTemplate, int id) { super(powerActionTemplate, id); }