Signature argument renamed

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.powers.ActionsBase;
 import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
-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 {
@@ -47,12 +38,12 @@ public abstract class AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public AbstractPowerAction(PowerAction rs){
+    public AbstractPowerAction(PowerAction powerAction) {
 
-        this.IDString = rs.action_id;
+        this.IDString = powerAction.action_id;
-        this.type = rs.action_type;
+        this.type = powerAction.action_type;
-        int flags = rs.itemFlag.ordinal();
+        int flags = powerAction.itemFlag.ordinal();
-        this.isAggressive = rs.isAggressive;
+        this.isAggressive = powerAction.isAggressive;
     }
 
     public AbstractPowerAction(int uUID, String iDString, String type, boolean isAggressive,

src/engine/powers/poweractions/ApplyEffectPowerAction.java

@@ -28,8 +28,6 @@ import engine.server.MBServerStatics;
 import engine.wpak.data.PowerAction;
 import org.pmw.tinylog.Logger;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 public class ApplyEffectPowerAction extends AbstractPowerAction {
@@ -39,11 +37,11 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
     private String effectParentID;
     private EffectsBase effectParent;
 
-    public ApplyEffectPowerAction(PowerAction rs, HashMap<String, EffectsBase> effects){
+    public ApplyEffectPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
-        this.effectParentID = rs.effects.get(0).effect_id;
+        this.effectParentID = powerAction.effects.get(0).effect_id;
         this.effectParent = effects.get(this.effectParentID);
-        this.effectID = rs.effects.get(0).effect_id;
+        this.effectID = powerAction.effects.get(0).effect_id;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/ApplyEffectsPowerAction.java

@@ -20,8 +20,6 @@ import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 import org.pmw.tinylog.Logger;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -33,11 +31,11 @@ public class ApplyEffectsPowerAction extends AbstractPowerAction {
     private EffectsBase effect2;
     private EffectsBase effectParent;
 
-    public ApplyEffectsPowerAction(PowerAction rs, HashMap<String, EffectsBase> effects){
+    public ApplyEffectsPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
-        this.IDString = rs.action_id;
+        this.IDString = powerAction.action_id;
-        this.effectID = rs.effects.get(0).effect_id;
+        this.effectID = powerAction.effects.get(0).effect_id;
-        this.effectID2 = rs.effects.get(2).effect_id;
+        this.effectID2 = powerAction.effects.get(2).effect_id;
         this.effect = effects.get(this.effectID);
         this.effect2 = effects.get(this.effectID2);
         this.effectParent = effects.get(this.IDString);

src/engine/powers/poweractions/BlockPowerAction.java

@@ -19,8 +19,8 @@ import engine.wpak.data.PowerAction;
 
 public class BlockPowerAction extends AbstractPowerAction {
 
-    public BlockPowerAction(PowerAction rs) {
+    public BlockPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/CharmPowerAction.java

@@ -20,19 +20,16 @@ import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 
 public class CharmPowerAction extends AbstractPowerAction {
 
     private int levelCap;
     private int levelCapRamp;
 
-    public CharmPowerAction(PowerAction rs){
+    public CharmPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
-        this.levelCap = rs.levelCap;
+        this.levelCap = powerAction.levelCap;
-        this.levelCapRamp = rs.levelCurve.ordinal();
+        this.levelCapRamp = powerAction.levelCurve.ordinal();
     }
 
     @Override

src/engine/powers/poweractions/ClaimMinePowerAction.java

@@ -20,8 +20,8 @@ import engine.wpak.data.PowerAction;
 
 public class ClaimMinePowerAction extends AbstractPowerAction {
 
-    public ClaimMinePowerAction(PowerAction rs) {
+    public ClaimMinePowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/ClearAggroPowerAction.java

@@ -21,8 +21,8 @@ import engine.wpak.data.PowerAction;
 
 public class ClearAggroPowerAction extends AbstractPowerAction {
 
-    public ClearAggroPowerAction(PowerAction rs) {
+    public ClearAggroPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java

@@ -20,8 +20,8 @@ import engine.wpak.data.PowerAction;
 
 public class ClearNearbyAggroPowerAction extends AbstractPowerAction {
 
-    public ClearNearbyAggroPowerAction(PowerAction rs) {
+    public ClearNearbyAggroPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/ConfusionPowerAction.java

@@ -16,14 +16,11 @@ import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 
 public class ConfusionPowerAction extends AbstractPowerAction {
 
-    public ConfusionPowerAction(PowerAction rs){
+    public ConfusionPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/CreateMobPowerAction.java

@@ -31,11 +31,11 @@ public class CreateMobPowerAction extends AbstractPowerAction {
     private int mobID;
     private int mobLevel;
 
-    public CreateMobPowerAction(PowerAction rs) {
+    public CreateMobPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
 
-        this.mobID = rs.petRace;
+        this.mobID = powerAction.petRace;
-        this.mobLevel = rs.petLevel;
+        this.mobLevel = powerAction.petLevel;
     }
 
     @Override

src/engine/powers/poweractions/DamageOverTimePowerAction.java

@@ -18,8 +18,6 @@ import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -29,11 +27,11 @@ public class DamageOverTimePowerAction extends AbstractPowerAction {
     private int numIterations;
     private EffectsBase effect;
 
-    public DamageOverTimePowerAction(PowerAction rs, HashMap<String, EffectsBase> effects){
+    public DamageOverTimePowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.action_id;
+        this.effectID = powerAction.action_id;
-        this.numIterations = rs.effects.get(0).cycleDelay;
+        this.numIterations = powerAction.effects.get(0).cycleDelay;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/DeferredPowerPowerAction.java

@@ -20,8 +20,6 @@ import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -32,11 +30,11 @@ public class DeferredPowerPowerAction extends AbstractPowerAction {
     private EffectsBase effect;
     //	private EffectsBase deferedPower;
 
-    public DeferredPowerPowerAction(PowerAction rs, HashMap<String, EffectsBase> effects){
+    public DeferredPowerPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.effects.get(0).effect_id;
+        this.effectID = powerAction.effects.get(0).effect_id;
-        this.deferedPowerID = rs.action_id;
+        this.deferedPowerID = powerAction.action_id;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/DirectDamagePowerAction.java

@@ -19,8 +19,6 @@ import engine.powers.EffectsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 
@@ -29,10 +27,10 @@ public class DirectDamagePowerAction extends AbstractPowerAction {
     private String effectID;
     private EffectsBase effect;
 
-    public DirectDamagePowerAction(PowerAction rs, HashMap<String, EffectsBase> effects){
+    public DirectDamagePowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.effects.get(0).effect_id;
+        this.effectID = powerAction.effects.get(0).effect_id;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/FearPowerAction.java

@@ -22,18 +22,15 @@ import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 public class FearPowerAction extends AbstractPowerAction {
 
     private int levelCap;
     private int levelCapRamp;
 
-    public FearPowerAction(PowerAction rs){
+    public FearPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
-        this.levelCap = rs.levelCap;
+        this.levelCap = powerAction.levelCap;
-        this.levelCapRamp = rs.levelCurve.ordinal();
+        this.levelCapRamp = powerAction.levelCurve.ordinal();
     }
 
     @Override

src/engine/powers/poweractions/InvisPowerAction.java

@@ -26,10 +26,10 @@ public class InvisPowerAction extends AbstractPowerAction {
     private String effectID;
     private EffectsBase effect;
 
-    public InvisPowerAction(PowerAction rs, HashMap<String, EffectsBase> effects) {
+    public InvisPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.effects.get(0).effect_id;
+        this.effectID = powerAction.effects.get(0).effect_id;
         ;
         this.effect = effects.get(this.effectID);
     }

src/engine/powers/poweractions/MobRecallPowerAction.java

@@ -21,8 +21,8 @@ import engine.wpak.data.PowerAction;
 
 public class MobRecallPowerAction extends AbstractPowerAction {
 
-    public MobRecallPowerAction(PowerAction rs) {
+    public MobRecallPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/OpenGatePowerAction.java

@@ -26,8 +26,8 @@ public class OpenGatePowerAction extends AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public OpenGatePowerAction(PowerAction rs) {
+    public OpenGatePowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     public OpenGatePowerAction(int uUID, String iDString, String type, boolean isAggressive, long validItemFlags) {

src/engine/powers/poweractions/PeekPowerAction.java

@@ -20,15 +20,13 @@ import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.concurrent.ThreadLocalRandom;
 
 
 public class PeekPowerAction extends AbstractPowerAction {
 
-    public PeekPowerAction(PowerAction rs){
+    public PeekPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     protected static boolean peekSuccess(AbstractCharacter pc, AbstractWorldObject awo) {

src/engine/powers/poweractions/RecallPowerAction.java

@@ -30,8 +30,8 @@ import engine.wpak.data.PowerAction;
 
 public class RecallPowerAction extends AbstractPowerAction {
 
-    public RecallPowerAction(PowerAction rs) {
+    public RecallPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/RemoveEffectPowerAction.java

@@ -17,9 +17,6 @@ import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
 import engine.wpak.data.PowerAction;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 
 public class RemoveEffectPowerAction extends AbstractPowerAction {
 
@@ -27,11 +24,11 @@ public class RemoveEffectPowerAction extends AbstractPowerAction {
     public EffectSourceType sourceType;
     private boolean removeAll;
 
-    public RemoveEffectPowerAction(PowerAction rs){
+    public RemoveEffectPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
-        String effectTypeToRemove = rs.damageType.name();
+        String effectTypeToRemove = powerAction.damageType.name();
         sourceType = EffectSourceType.GetEffectSourceType(effectTypeToRemove);
-        this.removeAll = rs.removeAll;
+        this.removeAll = powerAction.removeAll;
     }
 
 

src/engine/powers/poweractions/ResurrectPowerAction.java

@@ -19,8 +19,8 @@ import engine.wpak.data.PowerAction;
 
 public class ResurrectPowerAction extends AbstractPowerAction {
 
-    public ResurrectPowerAction(PowerAction rs) {
+    public ResurrectPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/RunegateTeleportPowerAction.java

@@ -27,8 +27,8 @@ public class RunegateTeleportPowerAction extends AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public RunegateTeleportPowerAction(PowerAction rs) {
+    public RunegateTeleportPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/SimpleDamagePowerAction.java

@@ -21,8 +21,8 @@ public class SimpleDamagePowerAction extends AbstractPowerAction {
 
     private int simpleDamage;
 
-    public SimpleDamagePowerAction(PowerAction rs) {
+    public SimpleDamagePowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
 
         this.simpleDamage = 1;
     }

src/engine/powers/poweractions/SpireDisablePowerAction.java

@@ -26,8 +26,8 @@ public class SpireDisablePowerAction extends AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public SpireDisablePowerAction(PowerAction rs) {
+    public SpireDisablePowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/StealPowerAction.java

@@ -34,8 +34,8 @@ public class StealPowerAction extends AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public StealPowerAction(PowerAction rs) {
+    public StealPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     protected static boolean stealSuccess(PlayerCharacter pc, AbstractWorldObject awo) {

src/engine/powers/poweractions/SummonPowerAction.java

@@ -30,8 +30,8 @@ public class SummonPowerAction extends AbstractPowerAction {
     /**
      * ResultSet Constructor
      */
-    public SummonPowerAction(PowerAction rs) {
+    public SummonPowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override

src/engine/powers/poweractions/TransformPowerAction.java

@@ -26,10 +26,10 @@ public class TransformPowerAction extends AbstractPowerAction {
     private String effectID;
     private EffectsBase effect;
 
-    public TransformPowerAction(PowerAction rs, HashMap<String, EffectsBase> effects) {
+    public TransformPowerAction(PowerAction powerAction, HashMap<String, EffectsBase> effects) {
-        super(rs);
+        super(powerAction);
 
-        this.effectID = rs.effects.get(0).effect_id;
+        this.effectID = powerAction.effects.get(0).effect_id;
         this.effect = effects.get(this.effectID);
     }
 

src/engine/powers/poweractions/TreeChokePowerAction.java

@@ -19,8 +19,8 @@ import engine.wpak.data.PowerAction;
 
 public class TreeChokePowerAction extends AbstractPowerAction {
 
-    public TreeChokePowerAction(PowerAction rs) {
+    public TreeChokePowerAction(PowerAction powerAction) {
-        super(rs);
+        super(powerAction);
     }
 
     @Override