Cleaned up bad logic in helper

src/engine/db/handlers/dbEffectsBaseHandler.java

@@ -0,0 +1,303 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.db.handlers;
+
+import engine.gameManager.DbManager;
+import engine.gameManager.PowersManager;
+import engine.mbEnums;
+import engine.powers.EffectsBase;
+import engine.powers.effectmodifiers.*;
+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.HashSet;
+
+public class dbEffectsBaseHandler extends dbHandlerBase {
+
+    public dbEffectsBaseHandler() {
+
+    }
+
+    public static ArrayList<EffectsBase> getAllEffectsBase() {
+
+        ArrayList<EffectsBase> effectList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement prepareStatement = connection.prepareStatement("SELECT * FROM static_power_effectbase ORDER BY `IDString` DESC")) {
+
+            ResultSet rs = prepareStatement.executeQuery();
+
+            while (rs.next()) {
+                EffectsBase effectBase = new EffectsBase(rs);
+                effectList.add(effectBase);
+            }
+        } catch (SQLException e) {
+            Logger.error(e.toString());
+        }
+
+        return effectList;
+    }
+
+    public static void cacheAllEffectModifiers() {
+
+        String IDString;
+        AbstractEffectModifier abstractEffectModifier = null;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement prepareStatement = connection.prepareStatement("SELECT * FROM static_power_effectmod")) {
+
+            ResultSet rs = prepareStatement.executeQuery();
+
+            while (rs.next()) {
+
+                IDString = rs.getString("IDString");
+                EffectsBase effectBase = PowersManager.getEffectByIDString(IDString);
+                mbEnums.ModType modifier = mbEnums.ModType.GetModType(rs.getString("modType"));
+
+                //combine item prefix and suffix effect modifiers
+
+                abstractEffectModifier = getCombinedModifiers(abstractEffectModifier, rs, effectBase, modifier);
+
+                if (abstractEffectModifier != null) {
+
+                    if (EffectsBase.modifiersMap.containsKey(effectBase.getIDString()) == false)
+                        EffectsBase.modifiersMap.put(effectBase.getIDString(), new HashSet<>());
+
+                    EffectsBase.modifiersMap.get(effectBase.getIDString()).add(abstractEffectModifier);
+
+                }
+
+            }
+
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+
+    }
+
+    private static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ResultSet rs, EffectsBase effectBase, mbEnums.ModType modifier) throws SQLException {
+        switch (modifier) {
+            case AdjustAboveDmgCap:
+                abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);
+                break;
+            case Ambidexterity:
+                abstractEffectModifier = new AmbidexterityEffectModifier(rs);
+                break;
+            case AnimOverride:
+                break;
+            case ArmorPiercing:
+                abstractEffectModifier = new ArmorPiercingEffectModifier(rs);
+                break;
+            case AttackDelay:
+                abstractEffectModifier = new AttackDelayEffectModifier(rs);
+                break;
+            case Attr:
+                abstractEffectModifier = new AttributeEffectModifier(rs);
+                break;
+            case BlackMantle:
+                abstractEffectModifier = new BlackMantleEffectModifier(rs);
+                break;
+            case BladeTrails:
+                abstractEffectModifier = new BladeTrailsEffectModifier(rs);
+                break;
+            case Block:
+                abstractEffectModifier = new BlockEffectModifier(rs);
+                break;
+            case BlockedPowerType:
+                abstractEffectModifier = new BlockedPowerTypeEffectModifier(rs);
+                break;
+            case CannotAttack:
+                abstractEffectModifier = new CannotAttackEffectModifier(rs);
+                break;
+            case CannotCast:
+                abstractEffectModifier = new CannotCastEffectModifier(rs);
+                break;
+            case CannotMove:
+                abstractEffectModifier = new CannotMoveEffectModifier(rs);
+                break;
+            case CannotTrack:
+                abstractEffectModifier = new CannotTrackEffectModifier(rs);
+                break;
+            case Charmed:
+                abstractEffectModifier = new CharmedEffectModifier(rs);
+                break;
+            case ConstrainedAmbidexterity:
+                abstractEffectModifier = new ConstrainedAmbidexterityEffectModifier(rs);
+                break;
+            case DamageCap:
+                abstractEffectModifier = new DamageCapEffectModifier(rs);
+                break;
+            case DamageShield:
+                abstractEffectModifier = new DamageShieldEffectModifier(rs);
+                break;
+            case DCV:
+                abstractEffectModifier = new DCVEffectModifier(rs);
+                break;
+            case Dodge:
+                abstractEffectModifier = new DodgeEffectModifier(rs);
+                break;
+            case DR:
+                abstractEffectModifier = new DREffectModifier(rs);
+                break;
+            case Durability:
+                abstractEffectModifier = new DurabilityEffectModifier(rs);
+                break;
+            case ExclusiveDamageCap:
+                abstractEffectModifier = new ExclusiveDamageCapEffectModifier(rs);
+                break;
+            case Fade:
+                abstractEffectModifier = new FadeEffectModifier(rs);
+                break;
+            case Fly:
+                abstractEffectModifier = new FlyEffectModifier(rs);
+                break;
+            case Health:
+                abstractEffectModifier = new HealthEffectModifier(rs);
+                break;
+            case HealthFull:
+                abstractEffectModifier = new HealthFullEffectModifier(rs);
+                break;
+            case HealthRecoverRate:
+                abstractEffectModifier = new HealthRecoverRateEffectModifier(rs);
+                break;
+            case IgnoreDamageCap:
+                abstractEffectModifier = new IgnoreDamageCapEffectModifier(rs);
+                break;
+            case IgnorePassiveDefense:
+                abstractEffectModifier = new IgnorePassiveDefenseEffectModifier(rs);
+                break;
+            case ImmuneTo:
+                abstractEffectModifier = new ImmuneToEffectModifier(rs);
+                break;
+            case ImmuneToAttack:
+                abstractEffectModifier = new ImmuneToAttackEffectModifier(rs);
+                break;
+            case ImmuneToPowers:
+                abstractEffectModifier = new ImmuneToPowersEffectModifier(rs);
+                break;
+            case Invisible:
+                abstractEffectModifier = new InvisibleEffectModifier(rs);
+                break;
+            case ItemName:
+                abstractEffectModifier = new ItemNameEffectModifier(rs);
+                if (((ItemNameEffectModifier) abstractEffectModifier).name.isEmpty())
+                    break;
+                if (effectBase != null)
+                    effectBase.setName((((ItemNameEffectModifier) abstractEffectModifier).name));
+                break;
+            case Mana:
+                abstractEffectModifier = new ManaEffectModifier(rs);
+                break;
+            case ManaFull:
+                abstractEffectModifier = new ManaFullEffectModifier(rs);
+                break;
+            case ManaRecoverRate:
+                abstractEffectModifier = new ManaRecoverRateEffectModifier(rs);
+                break;
+            case MaxDamage:
+                abstractEffectModifier = new MaxDamageEffectModifier(rs);
+                break;
+            case MeleeDamageModifier:
+                abstractEffectModifier = new MeleeDamageEffectModifier(rs);
+                break;
+            case MinDamage:
+                abstractEffectModifier = new MinDamageEffectModifier(rs);
+                break;
+            case NoMod:
+                abstractEffectModifier = new NoModEffectModifier(rs);
+                break;
+            case OCV:
+                abstractEffectModifier = new OCVEffectModifier(rs);
+                break;
+            case Parry:
+                abstractEffectModifier = new ParryEffectModifier(rs);
+                break;
+            case PassiveDefense:
+                abstractEffectModifier = new PassiveDefenseEffectModifier(rs);
+                break;
+            case PowerCost:
+                abstractEffectModifier = new PowerCostEffectModifier(rs);
+                break;
+            case PowerCostHealth:
+                abstractEffectModifier = new PowerCostHealthEffectModifier(rs);
+                break;
+            case PowerDamageModifier:
+                abstractEffectModifier = new PowerDamageEffectModifier(rs);
+                break;
+            case ProtectionFrom:
+                abstractEffectModifier = new ProtectionFromEffectModifier(rs);
+                break;
+            case Resistance:
+                abstractEffectModifier = new ResistanceEffectModifier(rs);
+                break;
+            case ScaleHeight:
+                abstractEffectModifier = new ScaleHeightEffectModifier(rs);
+                break;
+            case ScaleWidth:
+                abstractEffectModifier = new ScaleWidthEffectModifier(rs);
+                break;
+            case ScanRange:
+                abstractEffectModifier = new ScanRangeEffectModifier(rs);
+                break;
+            case SeeInvisible:
+                abstractEffectModifier = new SeeInvisibleEffectModifier(rs);
+                break;
+            case Silenced:
+                abstractEffectModifier = new SilencedEffectModifier(rs);
+                break;
+            case Skill:
+                abstractEffectModifier = new SkillEffectModifier(rs);
+                break;
+            case Slay:
+                abstractEffectModifier = new SlayEffectModifier(rs);
+                break;
+            case Speed:
+                abstractEffectModifier = new SpeedEffectModifier(rs);
+                break;
+            case SpireBlock:
+                abstractEffectModifier = new SpireBlockEffectModifier(rs);
+                break;
+            case Stamina:
+                abstractEffectModifier = new StaminaEffectModifier(rs);
+                break;
+            case StaminaFull:
+                abstractEffectModifier = new StaminaFullEffectModifier(rs);
+                break;
+            case StaminaRecoverRate:
+                abstractEffectModifier = new StaminaRecoverRateEffectModifier(rs);
+                break;
+            case Stunned:
+                abstractEffectModifier = new StunnedEffectModifier(rs);
+                break;
+            case Value:
+                abstractEffectModifier = new ValueEffectModifier(rs);
+                if (effectBase != null) {
+                    ValueEffectModifier valueEffect = (ValueEffectModifier) abstractEffectModifier;
+                    effectBase.setValue(valueEffect.minMod);
+                }
+                break;
+            case WeaponProc:
+                abstractEffectModifier = new WeaponProcEffectModifier(rs);
+                break;
+            case WeaponRange:
+                abstractEffectModifier = new WeaponRangeEffectModifier(rs);
+                break;
+            case WeaponSpeed:
+                abstractEffectModifier = new WeaponSpeedEffectModifier(rs);
+                break;
+
+        }
+        return abstractEffectModifier;
+    }
+}

src/engine/db/handlers/dbHandlerBase.java

@@ -58,6 +58,9 @@ public abstract class dbHandlerBase {
 
                 int id = rs.getInt(1);
 
+                if (id == 39052)
+                    Logger.info(id);
+
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {

src/engine/db/handlers/dbLootHandler.java

@@ -221,4 +221,20 @@ public class dbLootHandler extends dbHandlerBase {
         return bootySets;
     }
 
+    public void LOAD_ENCHANT_VALUES() {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `IDString`, `minMod` FROM `static_power_effectmod` WHERE `modType` = ?")) {
+
+            preparedStatement.setString(1, "Value");
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next())
+                Item.addEnchantValue(rs.getString("IDString"), rs.getInt("minMod"));
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
+
 }

src/engine/db/handlers/dbPowerHandler.java

@@ -0,0 +1,82 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.db.handlers;
+
+import engine.gameManager.DbManager;
+import engine.gameManager.PowersManager;
+import engine.mbEnums;
+import engine.objects.Mob;
+import engine.powers.EffectsBase;
+import org.pmw.tinylog.Logger;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.HashSet;
+
+public class dbPowerHandler extends dbHandlerBase {
+
+    public dbPowerHandler() {
+        this.localClass = Mob.class;
+        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+    }
+
+    public static void addAllSourceTypes() {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_sourcetype")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+            String IDString, source;
+
+            while (rs.next()) {
+                IDString = rs.getString("IDString");
+                int token = DbManager.hasher.SBStringHash(IDString);
+
+                source = rs.getString("source").replace("-", "").trim();
+                mbEnums.EffectSourceType effectSourceType = mbEnums.EffectSourceType.GetEffectSourceType(source);
+
+                if (EffectsBase.effectSourceTypeMap.containsKey(token) == false)
+                    EffectsBase.effectSourceTypeMap.put(token, new HashSet<>());
+
+                EffectsBase.effectSourceTypeMap.get(token).add(effectSourceType);
+            }
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+    }
+
+    public static void addAllAnimationOverrides() {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_animation_override")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            String IDString;
+            int animation;
+            while (rs.next()) {
+                IDString = rs.getString("IDString");
+
+                EffectsBase eb = PowersManager.getEffectByIDString(IDString);
+                if (eb != null)
+                    IDString = eb.getIDString();
+
+                animation = rs.getInt("animation");
+                PowersManager.AnimationOverrides.put(IDString, animation);
+
+            }
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+
+    }
+
+}

src/engine/devcmd/cmds/ApplyBonusCmd.java

@@ -0,0 +1,156 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ChatManager;
+import engine.gameManager.PowersManager;
+import engine.mbEnums.PowerActionType;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+import engine.powers.ActionsBase;
+import engine.powers.PowersBase;
+import engine.powers.effectmodifiers.AbstractEffectModifier;
+import engine.util.ThreadUtils;
+import org.pmw.tinylog.Logger;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class ApplyBonusCmd extends AbstractDevCmd {
+
+    public ApplyBonusCmd() {
+        super("applybonus");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+
+        String action = words[0];
+
+        PowerActionType actionType = null;
+
+        HashMap<String, HashSet<String>> appliedMods = new HashMap<>();
+
+        try {
+
+            if (action.equals("all") == false)
+                for (PowerActionType powerActionType : PowerActionType.values()) {
+                    if (powerActionType.name().equalsIgnoreCase(action) == false)
+                        continue;
+                    actionType = powerActionType;
+                    break;
+                }
+
+        } catch (Exception e) {
+            this.throwbackError(pcSender, "Invalid power Action type for " + action);
+            this.throwbackInfo(pcSender, "Valid Types : " + this.getActionTypes());
+            return;
+        }
+        if (action.equals("all") == false)
+            if (actionType == null) {
+                this.throwbackError(pcSender, "Invalid power Action type for " + action);
+                this.throwbackInfo(pcSender, "Valid Types : " + this.getActionTypes());
+                return;
+            }
+
+
+        for (PowersBase pb : PowersManager.powersBaseByIDString.values()) {
+            if (pb.getActions() == null || pb.getActions().isEmpty())
+                continue;
+
+            for (ActionsBase ab : pb.getActions()) {
+                if (ab.getPowerAction() == null)
+                    continue;
+                if (action.equals("all") == false)
+                    if (ab.getPowerAction().getType().equalsIgnoreCase(action) == false)
+                        continue;
+                String effect1 = "";
+                String effect2 = "";
+                ChatManager.chatSystemInfo(pcSender, "Applying Power " + pb.getName() + " : " + pb.getDescription());
+                if (ab.getPowerAction().getEffectsBase() == null) {
+
+                    try {
+                        PowersManager.runPowerAction(pcSender, pcSender, pcSender.getLoc(), ab, 1, pb);
+                    } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    ThreadUtils.sleep(500);
+                    continue;
+                }
+
+
+                if (ab.getPowerAction().getEffectsBase().getModifiers() == null || ab.getPowerAction().getEffectsBase().getModifiers().isEmpty()) {
+                    try {
+                        PowersManager.runPowerAction(pcSender, pcSender, pcSender.getLoc(), ab, 1, pb);
+                    } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    continue;
+                }
+
+                boolean run = true;
+                for (AbstractEffectModifier mod : ab.getPowerAction().getEffectsBase().getModifiers()) {
+                    if (appliedMods.containsKey(mod.modType.name()) == false) {
+                        appliedMods.put(mod.modType.name(), new HashSet<>());
+                    }
+
+//						if (appliedMods.get(mod.modType.name()).contains(mod.sourceType.name())){
+//							continue;
+//						}
+
+                    appliedMods.get(mod.modType.name()).add(mod.sourceType.name());
+                    try {
+                        try {
+                            PowersManager.runPowerAction(pcSender, pcSender, pcSender.getLoc(), ab, 1, pb);
+                        } catch (Exception e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+
+                    } catch (Exception e) {
+                        Logger.error(e);
+                    }
+                    break;
+
+
+                }
+
+            }
+        }
+    }
+
+
+    @Override
+    protected String _getUsageString() {
+        return "' /bounds'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Audits all the mobs in a zone.";
+
+    }
+
+    private String getActionTypes() {
+        String output = "";
+
+        for (PowerActionType actionType : PowerActionType.values()) {
+            output += actionType.name() + " | ";
+
+        }
+
+        return output.substring(0, output.length() - 3);
+    }
+
+}

src/engine/devcmd/cmds/InfoCmd.java

@@ -312,7 +312,7 @@ public class InfoCmd extends AbstractDevCmd {
                 if (targetPC.getGuild() != null) {
                     output += "Name: " + targetPC.getGuild().getName();
                     output += newline;
-                    output += "State: " + targetPC.getGuild().getGuildState();
+                    output += "State: " + targetPC.getGuild().guildState;
                     output += newline;
                     output += "Realms Owned:" + targetPC.getGuild().getRealmsOwned();
                     output += newline;
@@ -320,7 +320,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "Nation Name: " + targetPC.getGuild().getNation().getName();
                     output += newline;
-                    output += "Nation State: " + targetPC.getGuild().getNation().getGuildState();
+                    output += "Nation State: " + targetPC.getGuild().getNation().guildState;
                     output += newline;
                     output += "Realms Owned:" + targetPC.getGuild().getNation().getRealmsOwned();
                     output += newline;

src/engine/gameManager/BuildingManager.java

@@ -798,7 +798,7 @@ public enum BuildingManager {
         // Attempt to write to database or delete the building
         // if we are destroying it.
 
-        if (rank < 0)
+        if (rank == -1)
             success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         else
             success = DbManager.BuildingQueries.updateBuildingRank(building, rank);

src/engine/gameManager/CombatManager.java

@@ -462,11 +462,12 @@ public enum CombatManager {
 
             if (damage > 0) {
 
-                if (AbstractCharacter.IsAbstractCharacter(target))
+                if (AbstractCharacter.IsAbstractCharacter(target)) {
                     ((AbstractCharacter) target).modifyHealth(-damage, attacker, true);
-                else
+                    ((AbstractCharacter) target).cancelOnTakeDamage();
+                }else {
                     ((Building) target).modifyHealth(-damage, attacker);
-
+                }
                 int attackAnim = getSwingAnimation(null, null, slot);
                 if (attacker.charItemManager.getEquipped().get(slot) != null) {
                     if (attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {

src/engine/gameManager/ConfigManager.java

@@ -11,9 +11,6 @@ package engine.gameManager;
 import engine.mbEnums;
 import engine.server.login.LoginServer;
 import engine.server.world.WorldServer;
-import engine.wpak.EffectsParser;
-import engine.wpak.PowerActionParser;
-import engine.wpak.PowersParser;
 import org.pmw.tinylog.Logger;
 
 import java.io.BufferedReader;
@@ -170,9 +167,11 @@ public enum ConfigManager {
 
         Logger.info("Loading WPAK data");
 
-        //EffectsParser.parseWpakFile();
-        //PowersParser.parseWpakFile();
-        //PowerActionParser.parseWpakFile();
+        // *** Needs powermanager collection
+        // defined before activation.
+        // EffectsParser.parseWpakFile();
+        // PowersParser.parseWpakFile();
+        // PowerActionParser.parseWpakFile();
 
         return true;
     }

src/engine/gameManager/DbManager.java

@@ -69,6 +69,8 @@ public enum DbManager {
     public static final dbBlueprintHandler BlueprintQueries = new dbBlueprintHandler();
     public static final dbShrineHandler ShrineQueries = new dbShrineHandler();
     public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler();
+
+    public static final dbPowerHandler PowerQueries = new dbPowerHandler();
     public static final dbPetitionHandler PetitionQueries = new dbPetitionHandler();
     private static final EnumMap<GameObjectType, ConcurrentHashMap<Integer, AbstractGameObject>> objectCache = new EnumMap<>(GameObjectType.class);
     public static Hasher hasher;

src/engine/gameManager/DevCmdManager.java

@@ -122,6 +122,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetNpcNameCmd());
         DevCmdManager.registerDevCmd(new BoundsCmd());
         DevCmdManager.registerDevCmd(new RegionCmd());
+        DevCmdManager.registerDevCmd(new ApplyBonusCmd());
         DevCmdManager.registerDevCmd(new SlotTestCmd());
     }
 

src/engine/gameManager/ForgeManager.java

@@ -49,8 +49,15 @@ public enum ForgeManager implements Runnable {
     public static final ConcurrentHashMap<NPC, ConcurrentHashMap.KeySetView<WorkOrder, Boolean>> vendorWorkOrderLookup = new ConcurrentHashMap<>();
     public static final ConcurrentHashMap<Item, WorkOrder> itemWorkOrderLookup = new ConcurrentHashMap<>();
 
-    @Override
+    public static void start() {
 
+        Thread forgeManager;
+        forgeManager = new Thread(FORGE_MANAGER);
+        forgeManager.setName("Forge Manager");
+        forgeManager.start();
+    }
+
+    @Override
     public void run() {
 
         WorkOrder workOrder;
@@ -112,14 +119,6 @@ public enum ForgeManager implements Runnable {
         }
     }
 
-    public static void start() {
-
-        Thread forgeManager;
-        forgeManager = new Thread(FORGE_MANAGER);
-        forgeManager.setName("Forge Manager");
-        forgeManager.start();
-    }
-
     public static int submit(WorkOrder workOrder) {
 
         // Must have a city to roll anything

src/engine/gameManager/GuildManager.java

@@ -181,6 +181,19 @@ public enum GuildManager {
         }
     }
 
+    public static mbEnums.GuildState calcuateGuildState(Guild guild) {
+
+        if (guild.getNation() == guild)
+            return guild.getSubGuildList().isEmpty() ? mbEnums.GuildState.Sovereign : mbEnums.GuildState.Nation;
+
+        if (guild.getOwnedCity() == null)
+            return guild.getNation().isEmptyGuild() ? mbEnums.GuildState.Errant : mbEnums.GuildState.Sworn;
+
+        return (guild.getOwnedCity().getTOL().getRank() == 8)
+                ? mbEnums.GuildState.Province
+                : mbEnums.GuildState.Protectorate;
+    }
+
     //This updates tags for all online players in a guild.
     public static void updateAllGuildTags(Guild guild) {
 

src/engine/gameManager/PowersManager.java

@@ -10,6 +10,8 @@ package engine.gameManager;
 
 import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
+import engine.db.handlers.dbEffectsBaseHandler;
+import engine.db.handlers.dbPowerHandler;
 import engine.db.handlers.dbSkillReqHandler;
 import engine.job.AbstractJob;
 import engine.job.AbstractScheduleJob;
@@ -27,14 +29,8 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.objects.*;
 import engine.powers.*;
-import engine.powers.poweractions.*;
+import engine.powers.poweractions.AbstractPowerAction;
 import engine.server.MBServerStatics;
-import engine.wpak.EffectsParser;
-import engine.wpak.PowerActionParser;
-import engine.wpak.PowersParser;
-import engine.wpak.data.Effect;
-import engine.wpak.data.PowerAction;
-import engine.wpakpowers.WpakPowerManager;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -57,6 +53,7 @@ public enum PowersManager {
     public static HashMap<String, AbstractPowerAction> powerActionsByIDString = new HashMap<>();
     public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
     public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
+    public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
     public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
     public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
     public static HashMap<String, HashMap<ResourceType, Integer>> _effect_costMaps = new HashMap<>();
@@ -64,12 +61,10 @@ public enum PowersManager {
 
     public static void initPowersManager(boolean fullPowersLoad) {
 
-        if (fullPowersLoad) {
-            //PowersManager.InitializePowers();
-            WpakPowerManager.init();
-        }else {
+        if (fullPowersLoad)
+            PowersManager.InitializePowers();
+        else
             PowersManager.InitializeLoginPowers();
-        }
 
         PowersManager.js = JobScheduler.getInstance();
 
@@ -117,138 +112,33 @@ public enum PowersManager {
         return powerEntries;
     }
 
-    public static void InitializeEffects(){
-        // Add EffectsBase
-        ArrayList<EffectsBase> effectList = new ArrayList<>();
-
-        for (Effect entry : WpakPowerManager._effectsLookup.values()) {
-            EffectsBase effectBase = new EffectsBase(entry);
-            effectList.add(effectBase);
-            PowersManager.effectsBaseByToken.put(effectBase.getToken(), effectBase);
-            PowersManager.effectsBaseByIDString.put(effectBase.getIDString(), effectBase);
-        }
-
-    }
-
-    public static void InitializePowerActions(){
-        // Add PowerActions
-        //AbstractPowerAction.getAllPowerActions(PowersManager.powerActionsByIDString, PowersManager.powerActionsByID, PowersManager.effectsBaseByIDString);
-
-        HashMap<String, EffectsBase> effects = PowersManager.effectsBaseByIDString;
-
-        for (PowerAction powerAction : WpakPowerManager._powerActionLookup.values()) {
-            AbstractPowerAction apa;
-            PowerActionType type = powerAction.action_type;
-            String IDString = powerAction.action_id;
-            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" + IDString);
-                    break;
-                case ApplyEffect:
-                    apa = new ApplyEffectPowerAction(powerAction, effects);
-                    break;
-                case ApplyEffects:
-                    apa = new ApplyEffectsPowerAction(powerAction, effects);
-                    break;
-                case DeferredPower:
-                    apa = new DeferredPowerPowerAction(powerAction, effects);
-                    break;
-                case DamageOverTime:
-                    apa = new DamageOverTimePowerAction(powerAction, effects);
-                    break;
-                case Peek:
-                    apa = new PeekPowerAction(powerAction);
-                    break;
-                case Charm:
-                    apa = new CharmPowerAction(powerAction);
-                    break;
-                case RemoveEffect:
-                    apa = new RemoveEffectPowerAction(powerAction);
-                    break;
-                case Track:
-                    apa = new TrackPowerAction(powerAction, effects);
-                    break;
-                case DirectDamage:
-                    apa = new DirectDamagePowerAction(powerAction, effects);
-                    break;
-                case Transform:
-                    apa = new TransformPowerAction(powerAction, effects);
-                    break;
-                case CreateMob:
-                    apa = new CreateMobPowerAction(powerAction);
-                    break;
-                case Invis:
-                    apa = new InvisPowerAction(powerAction, effects);
-                    break;
-                case ClearNearbyAggro:
-                    apa = new ClearNearbyAggroPowerAction(powerAction);
-                    break;
-                case MobRecall:
-                    apa = new MobRecallPowerAction(powerAction);
-                    break;
-                case SetItemFlag:
-                    apa = new SetItemFlagPowerAction(powerAction);
-                    break;
-                case SimpleDamage:
-                    apa = new SimpleDamagePowerAction(powerAction);
-                    break;
-                case TransferStatOT:
-                    apa = new TransferStatOTPowerAction(powerAction, effects);
-                    break;
-                case TransferStat:
-                    apa = new TransferStatPowerAction(powerAction, effects);
-                    break;
-                case Teleport:
-                    apa = new TeleportPowerAction(powerAction);
-                    break;
-                case TreeChoke:
-                    apa = new TreeChokePowerAction(powerAction);
-                    break;
-                case Block:
-                    apa = new BlockPowerAction(powerAction);
-                    break;
-                case Resurrect:
-                    apa = new ResurrectPowerAction(powerAction);
-                    break;
-                case ClaimMine:
-                    apa = new ClaimMinePowerAction(powerAction);
-                    break;
-                case Recall:
-                    apa = new RecallPowerAction(powerAction);
-                    break;
-                case SpireDisable:
-                    apa = new SpireDisablePowerAction(powerAction);
-                    break;
-                case Steal:
-                    apa = new StealPowerAction(powerAction);
-                    break;
-                case Summon:
-                    apa = new SummonPowerAction(powerAction);
-                    break;
-                case RunegateTeleport:
-                    apa = new RunegateTeleportPowerAction(powerAction);
-                    break;
-            }
-            PowersManager.powerActionsByIDString.put(IDString, apa);
-        }
-    }
-
     // This pre-loads all powers and effects
     public static void InitializePowers() {
 
-        EffectsParser.parseWpakFile();
-        PowersParser.parseWpakFile();
-        PowerActionParser.parseWpakFile();
+        // Add EffectsBase
+        ArrayList<EffectsBase> ebList = dbEffectsBaseHandler.getAllEffectsBase();
 
-        //Initialize Effects Data
-        InitializeEffects();
+        for (EffectsBase eb : ebList) {
+            PowersManager.effectsBaseByToken.put(eb.getToken(), eb);
+            PowersManager.effectsBaseByIDString.put(eb.getIDString(), eb);
 
-        //Initialize Power Actions
-        InitializePowerActions();
+        }
+
+        // Add Fail Conditions
+        EffectsBase.getFailConditions(PowersManager.effectsBaseByIDString);
+
+        // Add Modifiers to Effects
+        dbEffectsBaseHandler.cacheAllEffectModifiers();
+
+        // Add Source Types to Effects
+        dbPowerHandler.addAllSourceTypes();
+        dbPowerHandler.addAllAnimationOverrides();
+
+        // Add PowerActions
+        AbstractPowerAction.getAllPowerActions(PowersManager.powerActionsByIDString, PowersManager.powerActionsByID, PowersManager.effectsBaseByIDString);
+
+        // Load valid Item Flags
+        //	AbstractPowerAction.loadValidItemFlags(PowersManager.powerActionsByIDString);
 
         // get all PowersBase
         ArrayList<PowersBase> pbList = dbSkillReqHandler.getAllPowersBase();
@@ -269,6 +159,16 @@ public enum PowersManager {
 
     }
 
+    public static EffectsBase setEffectToken(int ID, int token) {
+        for (EffectsBase eb : PowersManager.effectsBaseByIDString.values()) {
+            if (eb.getUUID() == ID) {
+                eb.setToken(token);
+                return eb;
+            }
+        }
+        return null;
+    }
+
     public static void usePower(final PerformActionMsg msg, ClientConnection origin,
                                 boolean sendCastToSelf) {
 
@@ -1057,7 +957,7 @@ public enum PowersManager {
                 //				if (!stackType.equals("IgnoreStack")) {
                 if (target.getEffects().containsKey(stackType)) {
                     // remove any existing power that overrides
-                    engine.objects.Effect ef = target.getEffects().get(stackType);
+                    Effect ef = target.getEffects().get(stackType);
                     AbstractEffectJob effect = null;
                     if (ef != null) {
                         JobContainer jc = ef.getJobContainer();
@@ -1229,7 +1129,7 @@ public enum PowersManager {
                 //				if (!stackType.equals("IgnoreStack")) {
                 if (target.getEffects().containsKey(stackType)) {
                     // remove any existing power that overrides
-                    engine.objects.Effect ef = target.getEffects().get(stackType);
+                    Effect ef = target.getEffects().get(stackType);
                     AbstractEffectJob effect = null;
                     if (ef != null) {
                         JobContainer jc = ef.getJobContainer();
@@ -1543,7 +1443,7 @@ public enum PowersManager {
             stackType = (stackType.equals("IgnoreStack")) ? Integer.toString(ab.getUUID()) : stackType;
             if (target.getEffects().containsKey(stackType)) {
                 // remove any existing power that overrides
-                engine.objects.Effect ef = target.getEffects().get(stackType);
+                Effect ef = target.getEffects().get(stackType);
                 AbstractEffectJob effect = null;
                 if (ef != null) {
                     JobContainer jc = ef.getJobContainer();
@@ -1990,7 +1890,7 @@ public enum PowersManager {
         stackType = (stackType.equals("IgnoreStack")) ? Integer
                 .toString(toRemove.getUUID()) : stackType;
         if (fromChant) {
-            engine.objects.Effect eff = awo.getEffects().get(stackType);
+            Effect eff = awo.getEffects().get(stackType);
             if (eff != null)
                 eff.cancelJob(true);
         } else

src/engine/jobs/UsePowerJob.java

@@ -14,7 +14,6 @@ import engine.job.AbstractScheduleJob;
 import engine.net.client.msg.PerformActionMsg;
 import engine.objects.PlayerCharacter;
 import engine.powers.PowersBase;
-import engine.wpak.data.Power;
 
 public class UsePowerJob extends AbstractScheduleJob {
 

src/engine/jobs/WpakUsePowerJob.java

@@ -1,42 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.jobs;
-
-import engine.gameManager.PowersManager;
-import engine.job.AbstractScheduleJob;
-import engine.net.client.msg.PerformActionMsg;
-import engine.objects.AbstractWorldObject;
-import engine.objects.PlayerCharacter;
-import engine.wpakpowers.WpakPowerManager;
-
-public class WpakUsePowerJob extends AbstractScheduleJob {
-
-    private final PlayerCharacter pc;
-    private final PerformActionMsg msg;
-    private AbstractWorldObject target;
-
-    public WpakUsePowerJob(PlayerCharacter pc, PerformActionMsg msg, AbstractWorldObject tar) {
-        super();
-        this.pc = pc;
-        this.msg = msg;
-        this.target = tar;
-    }
-
-    @Override
-    protected void doJob() {
-        WpakPowerManager.finishUsePower(this.msg, this.pc,this.target);
-    }
-
-    @Override
-    protected void _cancelJob() {
-        //cast stopped early, reset recycle timer
-        PowersManager.finishRecycleTime(this.msg, this.pc, true);
-    }
-}

src/engine/net/client/handlers/AbandonAssetMsgHandler.java

@@ -173,7 +173,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
         }
 
         sourceGuild.setCityUUID(0);
-        sourceGuild.setGuildState(GuildState.Errant);
+        sourceGuild.guildState = GuildState.Errant;
         sourceGuild.setNation(null);
 
         // Transfer the city assets

src/engine/net/client/handlers/AcceptSubInviteHandler.java

@@ -38,8 +38,8 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
 
         AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
         PlayerCharacter sourcePlayer;
-        Guild sourceGuild;
-        Guild targetGuild;
+        Guild swornGuild;
+        Guild nation;
         Dispatch dispatch;
 
         // get PlayerCharacter of person sending sub invite
@@ -49,21 +49,21 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
         if (sourcePlayer == null)
             return true;
 
-        sourceGuild = sourcePlayer.getGuild();
-        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
+        swornGuild = sourcePlayer.getGuild();
+        nation = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
 
         //must be source guild to sub to
 
-        if (targetGuild == null) {
+        if (nation == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
-        if (sourceGuild == null) {
+        if (swornGuild == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
 
-        if (sourceGuild.equals(targetGuild))
+        if (swornGuild.equals(nation))
             return true;
 
         if (GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus()) == false) {
@@ -74,7 +74,7 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
-        if (!targetGuild.canSubAGuild(sourceGuild)) {
+        if (!nation.canSubAGuild(swornGuild)) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
             return true;
         }
@@ -82,24 +82,20 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
         //all tests passed, let's Handle code
         //Update Target Guild State.
 
-        sourceGuild.upgradeGuildState(false);
+        swornGuild.guildState = GuildState.Petitioner;
 
         //Add sub so GuildMaster can Swear in.
 
-        ArrayList<Guild> subs = targetGuild.getSubGuildList();
-        subs.add(sourceGuild);
-
-        targetGuild.setGuildState(GuildState.Nation);
-
+        ArrayList<Guild> subGuildList = nation.getSubGuildList();
+        subGuildList.add(swornGuild);
 
         //Let's send the message back.
 
+        ChatManager.chatGuildInfo(sourcePlayer, "Your guild is now a " + swornGuild.guildState.name() + '.');
         msg.setUnknown02(1);
-        msg.setResponse("Your guild is now a " + sourceGuild.getGuildState().name() + '.');
+        msg.setResponse("Your guild is now a " + swornGuild.guildState.name() + '.');
         dispatch = Dispatch.borrow(sourcePlayer, msg);
         DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
-
-        ChatManager.chatSystemInfo(sourcePlayer, "Your guild is now a " + sourceGuild.getGuildState().name() + '.');
         return true;
     }
 }

src/engine/net/client/handlers/BreakFealtyHandler.java

@@ -35,8 +35,8 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
         BreakFealtyMsg bfm;
         PlayerCharacter player;
-        Guild toBreak;
-        Guild guild;
+        Guild nation;
+        Guild protectorate;
         Dispatch dispatch;
 
         bfm = (BreakFealtyMsg) baseMsg;
@@ -49,113 +49,100 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
         if (player == null)
             return true;
 
-        toBreak = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
+        nation = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
 
-        if (toBreak == null) {
+        if (nation == null) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
             return true;
         }
 
-        guild = player.getGuild();
+        protectorate = player.getGuild();
 
-        if (guild == null) {
+        if (protectorate == null) {
             ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!");
             return true;
         }
 
-        if (toBreak.isNPCGuild()) {
-            if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
+        if (nation.isNPCGuild()) {
+            if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
                 ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
                 return true;
             }
 
 
-            if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
+            if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
                 ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
                 return true;
             }
 
-            switch (guild.getGuildState()) {
+            switch (protectorate.guildState) {
                 case Sworn:
-                    guild.setNation(null);
-                    GuildManager.updateAllGuildTags(guild);
-                    GuildManager.updateAllGuildBinds(guild, null);
+                    protectorate.setNation(Guild.getErrantNation());
+                    GuildManager.updateAllGuildTags(protectorate);
+                    GuildManager.updateAllGuildBinds(protectorate, null);
+                    protectorate.guildState = mbEnums.GuildState.Errant;
                     break;
                 case Province:
-                    guild.setNation(guild);
-                    GuildManager.updateAllGuildTags(guild);
-                    GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
+                case Protectorate:
+                    protectorate.setNation(protectorate);
+                    GuildManager.updateAllGuildTags(protectorate);
+                    GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
+                    protectorate.guildState = mbEnums.GuildState.Sovereign;
                     break;
             }
 
-            guild.downgradeGuildState();
-
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
             dispatch = Dispatch.borrow(player, msg);
             DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
 
-            //Update Map.
-
-            final Session s = SessionManager.getSession(player);
-
             City.lastCityUpdate = System.currentTimeMillis();
+            ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
 
+            for (PlayerCharacter member : guildMembers)
+                ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
 
-            ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
+            ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
-            for (PlayerCharacter member : guildMembers) {
-                ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
-            }
-
-            ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
-
-            for (PlayerCharacter member : breakFealtyMembers) {
-                ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
-            }
+            for (PlayerCharacter member : breakFealtyMembers)
+                ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
 
             return true;
-
-
         }
 
-        if (!toBreak.getSubGuildList().contains(guild)) {
+        if (!nation.getSubGuildList().contains(protectorate)) {
             ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!");
             return true;
         }
 
-        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
+        if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
             ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
             return true;
         }
 
-        if (Bane.getBaneByAttackerGuild(guild) != null) {
+        if (Bane.getBaneByAttackerGuild(protectorate) != null) {
             ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!");
             return true;
         }
 
-        if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
+        if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
             return true;
         }
 
-        switch (guild.getGuildState()) {
+        switch (protectorate.guildState) {
             case Sworn:
-                guild.setNation(null);
-                GuildManager.updateAllGuildTags(guild);
-                GuildManager.updateAllGuildBinds(guild, null);
+                protectorate.setNation(Guild.getErrantNation());
+                GuildManager.updateAllGuildTags(protectorate);
+                GuildManager.updateAllGuildBinds(protectorate, null);
                 break;
             case Province:
-                guild.setNation(guild);
-                GuildManager.updateAllGuildTags(guild);
-                GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
+                protectorate.setNation(protectorate);
+                GuildManager.updateAllGuildTags(protectorate);
+                GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
                 break;
         }
 
-        guild.downgradeGuildState();
-        toBreak.getSubGuildList().remove(guild);
-
-        if (toBreak.getSubGuildList().isEmpty())
-            toBreak.downgradeGuildState();
+        nation.getSubGuildList().remove(protectorate);
 
         SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
         dispatch = Dispatch.borrow(player, msg);
@@ -167,17 +154,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
         City.lastCityUpdate = System.currentTimeMillis();
 
-
-        ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
+        ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
 
         for (PlayerCharacter member : guildMembers) {
-            ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
+            ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
         }
 
-        ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
+        ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
         for (PlayerCharacter member : breakFealtyMembers) {
-            ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
+            ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
         }
 
         return true;

src/engine/net/client/handlers/ChannelMuteMsgHandler.java

@@ -78,7 +78,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler {
         }
 
         sourceGuild.setCityUUID(0);
-        sourceGuild.setGuildState(GuildState.Errant);
+        sourceGuild.guildState = GuildState.Errant;
         sourceGuild.setNation(null);
 
         // Transfer the city assets

src/engine/net/client/handlers/DisbandGuildHandler.java

@@ -99,7 +99,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
         player.setGuildLeader(false);
         player.setInnerCouncil(false);
         guild.setGuildLeaderUUID(0);
-        guild.setNation(null);
+        guild.setNation(Guild.getErrantNation());
 
         DbManager.GuildQueries.DELETE_GUILD(guild);
 

src/engine/net/client/handlers/DismissGuildHandler.java

@@ -77,7 +77,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        switch (toDismiss.getGuildState()) {
+        switch (toDismiss.guildState) {
             case Sworn:
 
                 if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
@@ -85,35 +85,37 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
                     return true;
                 }
                 nation.getSubGuildList().remove(toDismiss);
-                toDismiss.downgradeGuildState();
-                toDismiss.setNation(null);
+                toDismiss.guildState = mbEnums.GuildState.Errant;
+                toDismiss.setNation(Guild.getErrantNation());
                 GuildManager.updateAllGuildBinds(toDismiss, null);
 
                 break;
+            case Petitioner:
+
+                nation.getSubGuildList().remove(toDismiss);
+
+                if (toDismiss.getNation().isEmptyGuild())
+                    toDismiss.guildState = mbEnums.GuildState.Errant;
+                else
+                    toDismiss.guildState = mbEnums.GuildState.Sovereign;
+
+                break;
+            case Protectorate:
             case Province:
                 if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
                     ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
                     return true;
                 }
                 nation.getSubGuildList().remove(toDismiss);
-                toDismiss.downgradeGuildState();
+                toDismiss.guildState = mbEnums.GuildState.Sovereign;
                 toDismiss.setNation(toDismiss);
-
-                break;
-            case Petitioner:
-                nation.getSubGuildList().remove(toDismiss);
-                toDismiss.downgradeGuildState();
-                break;
-            case Protectorate:
-                nation.getSubGuildList().remove(toDismiss);
-                toDismiss.downgradeGuildState();
                 break;
         }
 
         GuildManager.updateAllGuildTags(toDismiss);
 
         if (nation.getSubGuildList().isEmpty())
-            nation.downgradeGuildState();
+            nation.guildState = mbEnums.GuildState.Sovereign;
 
         SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
         dispatch = Dispatch.borrow(player, msg);

src/engine/net/client/handlers/InviteToSubHandler.java

@@ -36,8 +36,8 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
 
         PlayerCharacter source;
         PlayerCharacter target;
-        Guild sourceGuild;
-        Guild targetGuild;
+        Guild nation;
+        Guild protectorate;
         InviteToSubMsg msg = (InviteToSubMsg) baseMsg;
         Dispatch dispatch;
 
@@ -58,17 +58,17 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         if (target.isIgnoringPlayer(source))
             return true;
 
-        sourceGuild = source.getGuild();
-        targetGuild = target.getGuild();
+        nation = source.getGuild();
+        protectorate = target.getGuild();
 
         //source must be in guild
 
-        if (sourceGuild == null) {
+        if (nation == null) {
             sendChat(source, "You must be in a guild to invite to sub.");
             return true;
         }
 
-        if (sourceGuild.isEmptyGuild()) {
+        if (nation.isEmptyGuild()) {
             sendChat(source, "You must be in a guild to invite to sub.");
             return true;
         }
@@ -80,15 +80,15 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        if (sourceGuild.getNation().isEmptyGuild())
+        if (nation.getNation().isEmptyGuild())
             return true;
 
         //target must be in a guild
 
-        if (targetGuild == null)
+        if (protectorate == null)
             return true;
 
-        if (sourceGuild.equals(targetGuild))
+        if (nation.equals(protectorate))
             return true;
 
         //target must be GL or IC
@@ -98,18 +98,21 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        //Can't already be same nation or errant
-        //source guild is limited to 7 subs
-        //TODO this should be based on TOL rank
-
         //cannot be subbed into a nation if you already have your own sub guilds
-        if(targetGuild.getSubGuildList() != null && targetGuild.getSubGuildList().size() > 0)
+        if (protectorate.getSubGuildList() != null && protectorate.getSubGuildList().size() > 0) {
+            sendChat(source, "This Guild is already a nation!");
             return true;
+        }
 
-        if (!sourceGuild.canSubAGuild(targetGuild)) {
+        if (!nation.canSubAGuild(protectorate)) {
             sendChat(source, "This Guild can't be subbed.");
             return true;
         }
+
+        if (nation.getSubGuildList().size() >= nation.getOwnedCity().getRank()) {
+            sendChat(source, "Your TOL cannot support another subguild!");
+            return true;
+        }
         if (ConfigManager.MB_RULESET.getValue().equals("LORE")) {
             if (source.guild.getGuildType().equals(target.guild.getGuildType()) == false) {
                 sendChat(source, "You Must Be The Same Charter To Form A Nation.");
@@ -119,9 +122,9 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         //all tests passed, let's send invite.
 
         if (target.getClientConnection() != null) {
-            msg.setGuildTag(sourceGuild.getGuildTag());
-            msg.setGuildName(sourceGuild.getName());
-            msg.setGuildUUID(sourceGuild.getObjectUUID());
+            msg.setGuildTag(nation.getGuildTag());
+            msg.setGuildName(nation.getName());
+            msg.setGuildUUID(nation.getObjectUUID());
             msg.setUnknown02(1);
 
             dispatch = Dispatch.borrow(target, msg);

src/engine/net/client/handlers/MerchantMsgHandler.java

@@ -79,18 +79,14 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
-
         GuildManager.updateAllGuildBinds(player.getGuild(), npc.getGuild().getOwnedCity());
 
-
         //update Guild state.
         player.getGuild().setNation(npc.getGuild());
         GuildManager.updateAllGuildTags(player.getGuild());
 
-        //update state twice, errant to petitioner, to sworn.
-        player.getGuild().upgradeGuildState(false);//to petitioner
-        player.getGuild().upgradeGuildState(false);//to sworn
-
+        //update state
+        player.getGuild().guildState = mbEnums.GuildState.Sworn;
 
     }
 

src/engine/net/client/handlers/PerformActionMsgHandler.java

@@ -8,10 +8,10 @@
 
 package engine.net.client.handlers;
 
+import engine.gameManager.PowersManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.PerformActionMsg;
-import engine.wpakpowers.WpakPowerManager;
 
 public class PerformActionMsgHandler extends AbstractClientMsgHandler {
 
@@ -23,8 +23,7 @@ public class PerformActionMsgHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
 
         PerformActionMsg msg = (PerformActionMsg) baseMsg;
-        //PowersManager.beginCast(msg, origin, false);  // Wtf ?
-        WpakPowerManager.beginCast(msg, origin, false);
+        PowersManager.usePower(msg, origin, false);  // Wtf ?
 
         return true;
     }

src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@@ -88,8 +88,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         // Validate that the player is the leader of a guild
         // that is not currently Sovereign  *** BUG? Doesn't look right.  isGuildLeader()?
 
-        if ((playerCharacter.getGuild().getGuildState() != GuildState.Sworn
-                || playerCharacter.getGuild().getGuildState() != GuildState.Errant) == false) {
+        if ((playerCharacter.getGuild().guildState != GuildState.Sworn
+                || playerCharacter.getGuild().guildState != GuildState.Errant) == false) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 17, ""); // Your is not an errant or soverign guild
             return false;
         }
@@ -161,7 +161,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Errant guilds cannot place assets
 
-        if (player.getGuild().getGuildState() == GuildState.Errant) {
+        if (player.getGuild().guildState == GuildState.Errant) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Only sovereign or sworn guilds may place assets.");
             return false;
         }
@@ -774,7 +774,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         playerCharacter.getGuild().setNation(playerCharacter.getGuild());
         playerNation = playerCharacter.getGuild();
-        playerNation.setGuildState(GuildState.Sovereign);
+        playerNation.guildState = GuildState.Sovereign;
 
         // Update guild binds and tags
 

src/engine/net/client/handlers/SendSummonsMsgHandler.java

@@ -17,10 +17,8 @@ import engine.net.client.msg.PerformActionMsg;
 import engine.net.client.msg.SendSummonsMsg;
 import engine.objects.PlayerCharacter;
 import engine.server.MBServerStatics;
-import engine.wpakpowers.WpakPowerManager;
 
-import static engine.gameManager.PowersManager.sendPowerMsg;
-import static engine.gameManager.PowersManager.sendRecyclePower;
+import static engine.gameManager.PowersManager.*;
 
 public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
 
@@ -83,8 +81,7 @@ public class SendSummonsMsgHandler extends AbstractClientMsgHandler {
 
         // Client removes 200 mana on summon use.. so don't send message to self
         target.addSummoner(playerCharacter.getObjectUUID(), System.currentTimeMillis() + MBServerStatics.FOURTYFIVE_SECONDS);
-        //beginCast(pam, origin, false);
-        WpakPowerManager.beginCast(pam, origin, false);
+        usePower(pam, origin, false);
 
         return true;
     }

src/engine/net/client/handlers/SwearInGuildHandler.java

@@ -37,7 +37,7 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
         PlayerCharacter player;
         SwearInGuildMsg swearInMsg;
-        Guild targetGuild;
+        Guild protectorate;
         Guild nation;
         Dispatch dispatch;
 
@@ -47,9 +47,9 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
         if (player == null)
             return true;
 
-        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
+        protectorate = (Guild) DbManager.getObject(GameObjectType.Guild, swearInMsg.getGuildUUID());
 
-        if (targetGuild == null) {
+        if (protectorate == null) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
             return true;
         }
@@ -66,13 +66,14 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 ErrorPopupMsg.sendErrorMsg(player, "Your guild is not a nation!");
                 return true;
             }
-            if (!nation.getSubGuildList().contains(targetGuild)) {
-                ErrorPopupMsg.sendErrorMsg(player, "Your do not have such authority!");
+
+            if (!nation.getSubGuildList().contains(protectorate)) {
+                ErrorPopupMsg.sendErrorMsg(player, "Guild is not a petitioner!");
                 return true;
             }
 
-            if (!Guild.canSwearIn(targetGuild)) {
-                ErrorPopupMsg.sendErrorMsg(player, targetGuild.getGuildState().name() + "cannot be sworn in");
+            if (protectorate.guildState.equals(GuildState.Petitioner) == false) {
+                ErrorPopupMsg.sendErrorMsg(player, "Guild is not a petitioner!");
                 return true;
             }
 
@@ -81,29 +82,27 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            if (!DbManager.GuildQueries.UPDATE_PARENT(targetGuild.getObjectUUID(), nation.getObjectUUID())) {
+            if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), nation.getObjectUUID())) {
                 ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
                 return true;
             }
 
-            switch (targetGuild.getGuildState()) {
-                case Petitioner:
-                    GuildManager.updateAllGuildBinds(targetGuild, nation.getOwnedCity());
-                    break;
-                case Protectorate:
-                    break;
-                default:
-                    //shouldn't get here.
-                    break;
-            }
+            // update Guild state.
+            // R8 is a province
 
-            //update Guild state.
-            targetGuild.setNation(nation);
-            GuildManager.updateAllGuildTags(targetGuild);
-            targetGuild.upgradeGuildState(false);
+            if (protectorate.getNation().isEmptyGuild())
+                protectorate.guildState = GuildState.Sworn;
+            else
+                protectorate.guildState = (protectorate.getOwnedCity().getTOL().getRank() == 8)
+                        ? GuildState.Province
+                        : GuildState.Protectorate;
 
-            if (nation.getGuildState() == GuildState.Sovereign)
-                nation.upgradeGuildState(true);
+            protectorate.setNation(nation);
+            GuildManager.updateAllGuildTags(protectorate);
+
+            if (nation.guildState == GuildState.Sovereign)
+                if (protectorate.guildState.equals(GuildState.Protectorate))
+                    nation.guildState = GuildState.Nation;
 
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
             dispatch = Dispatch.borrow(player, msg);
@@ -113,15 +112,14 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
 
             ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
-            for (PlayerCharacter member : guildMembers) {
-                ChatManager.chatGuildInfo(member, "Your Guild is now a Nation!");
-            }
+            for (PlayerCharacter member : guildMembers)
+                ChatManager.chatGuildInfo(member, protectorate.getName() + " has sworn fealty to you.");
 
-            ArrayList<PlayerCharacter> swornMembers = SessionManager.getActivePCsInGuildID(targetGuild.getObjectUUID());
+            ArrayList<PlayerCharacter> swornMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
+
+            for (PlayerCharacter member : swornMembers)
+                ChatManager.chatGuildInfo(member, "Your Guild has sworn fealty to " + nation.getName() + '.');
 
-            for (PlayerCharacter member : swornMembers) {
-                ChatManager.chatGuildInfo(member, "Your Guild has sword fealty to " + nation.getName() + '.');
-            }
         } catch (Exception e) {
             Logger.error(e.getMessage());
             return true;

src/engine/net/client/handlers/TrackWindowMsgHandler.java

@@ -86,15 +86,15 @@ public class TrackWindowMsgHandler extends AbstractClientMsgHandler {
         if (ablist == null)
             return true;
 
-        TrackPowerAction trackPowerAction = null;
+        TrackPowerAction tpa = null;
 
         for (ActionsBase ab : ablist) {
             AbstractPowerAction apa = ab.getPowerAction();
             if (apa != null && apa instanceof TrackPowerAction)
-                trackPowerAction = (TrackPowerAction) apa;
+                tpa = (TrackPowerAction) apa;
         }
 
-        if (trackPowerAction == null)
+        if (tpa == null)
             return true;
 
         // Check powers for normal users
@@ -111,16 +111,16 @@ public class TrackWindowMsgHandler extends AbstractClientMsgHandler {
         int mask = 0;
 
         if (pb.targetPlayer())
-            if (trackPowerAction.powerAction.trackEntry.filter.equals(mbEnums.MonsterType.Vampire)) // track vampires
+            if (tpa.trackVampire()) // track vampires
                 mask = MBServerStatics.MASK_PLAYER | MBServerStatics.MASK_UNDEAD;
             else
                 // track all players
                 mask = MBServerStatics.MASK_PLAYER;
         else if (pb.targetCorpse()) // track corpses
             mask = MBServerStatics.MASK_CORPSE;
-        else if (trackPowerAction.powerAction.trackEntry.filter.equals(mbEnums.MonsterType.NPC)) // Track NPCs
+        else if (tpa.trackNPC()) // Track NPCs
             mask = MBServerStatics.MASK_NPC;
-        else if (trackPowerAction.powerAction.trackEntry.filter.equals(mbEnums.MonsterType.Undead)) // Track Undead
+        else if (tpa.trackUndead()) // Track Undead
             mask = MBServerStatics.MASK_MOB | MBServerStatics.MASK_UNDEAD;
         else
             // Track All

src/engine/net/client/msg/ManageCityAssetsMsg.java

@@ -437,7 +437,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             else
                 writer.putInt((int) timeLeft / 1000); // Time remaing until bane/Seconds
 
-            if (attackerGuild.getGuildState() == GuildState.Sworn)
+            if (attackerGuild.guildState == GuildState.Sworn)
                 writer.putInt(4); //3 capture/errant,4 capture/sworn, 5 destroy/soveirgn.
             else
                 writer.putInt(5);

src/engine/net/client/msg/guild/SendGuildEntryMsg.java

@@ -63,7 +63,7 @@ public class SendGuildEntryMsg extends ClientNetMsg {
         if (subsAndSovs.size() > 0) {
 
             for (Guild guild : subsAndSovs) {
-                int state = guild.getGuildState().getStateID();
+                int state = guild.guildState.getStateID();
 
                 writer.putInt(guild.getObjectType().ordinal());
                 writer.putInt(guild.getObjectUUID());

src/engine/objects/AbstractWorldObject.java

@@ -29,7 +29,6 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.UpdateEffectsMsg;
 import engine.powers.EffectsBase;
 import engine.server.MBServerStatics;
-import engine.wpakpowers.AppliedEffect;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -61,10 +60,6 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
     private int objectTypeMask = 0;
     private Bounds bounds;
 
-    // Effects collection for wpak power manager
-
-    public ConcurrentHashMap<engine.wpak.data.Effect, AppliedEffect> _effects = new ConcurrentHashMap<>();
-
     /**
      * No Id Constructor
      */
@@ -380,7 +375,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (eff == null) {
                 continue;
             }
-            if (eff.getEffectsBase().effectSources.contains(source) && trains >= eff.getTrains()) {
+            if (eff.containsSource(source) && trains >= eff.getTrains()) {
                 if (removeAll) {
                     //remove all effects of source type
                     if (eff.cancel()) {

src/engine/objects/Building.java

@@ -561,7 +561,7 @@ public class Building extends AbstractWorldObject {
                 BuildingManager.setRank(barracksBuilding, -1);
         }
 
-        // If the tree is R8 and deranking, we need to update the
+        // If the tree is R8 and deranking, we need to update it's
         // mesh along with buildings losing their health bonus
 
         if (this.rank == 8) {
@@ -602,13 +602,10 @@ public class Building extends AbstractWorldObject {
 
             this.isDeranking.compareAndSet(false, true);
 
-            if ((bane.getOwner().getGuild().getGuildState() == GuildState.Sovereign) ||
-                    (bane.getOwner().getGuild().getGuildState() == GuildState.Protectorate) ||
-                    (bane.getOwner().getGuild().getGuildState() == GuildState.Province) ||
-                    (bane.getOwner().getGuild().getGuildState() == GuildState.Nation))
-                siegeResult = SiegeResult.DESTROY;
-            else
+            if (bane.getOwner().getGuild().guildState == GuildState.Sworn)
                 siegeResult = SiegeResult.CAPTURE;
+            else
+                siegeResult = SiegeResult.DESTROY;
 
             // Remove realm if city had one
 
@@ -959,7 +956,7 @@ public class Building extends AbstractWorldObject {
                 // Altitude of this building is derived from the heightmap engine.
 
                 Vector3fImmutable tempLoc = new Vector3fImmutable(this.statLat + this.parentZone.absX, 0, this.statLon + this.parentZone.absZ);
-                tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc), tempLoc.z);
+                tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc) + this.statAlt, tempLoc.z);
                 this.setLoc(tempLoc);
             }
         }

src/engine/objects/City.java

@@ -41,7 +41,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class City extends AbstractWorldObject {
@@ -81,7 +80,6 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
-    public AtomicBoolean isDestroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -324,7 +322,6 @@ public class City extends AbstractWorldObject {
                 continue;
 
             //can't repledge to a guild you're already part of
-
             if (repledge && city.getGuild().equals(playerCharacter.guild))
                 continue;
 
@@ -816,10 +813,10 @@ public class City extends AbstractWorldObject {
 
             // Determine if this city is a nation capitol
 
-            if (this.getGuild().getGuildState() == GuildState.Nation)
+            if (this.getGuild().guildState == GuildState.Nation)
                 for (Guild sub : this.getGuild().getSubGuildList()) {
 
-                    if ((sub.getGuildState() == GuildState.Protectorate) || (sub.getGuildState() == GuildState.Province)) {
+                    if ((sub.guildState == GuildState.Protectorate) || (sub.guildState == GuildState.Province)) {
                         this.isCapital = 1;
                         break;
                     }
@@ -1119,21 +1116,17 @@ public class City extends AbstractWorldObject {
 
     public final void destroy() {
 
-        if (this.isDestroyed.compareAndSet(false, true)) {
+        Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-            Thread destroyCityThread = new Thread(new DestroyCityThread(this));
-
-            destroyCityThread.setName("destroyCity:" + this.getParent().zoneName);
-            destroyCityThread.start();
-        } else
-            Logger.error("Attempt to destroy destroyed city");
+        destroyCityThread.setName("destroyCity:" + this.getName());
+        destroyCityThread.start();
     }
 
     public final void transfer(AbstractCharacter newOwner) {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity:" + this.getParent().zoneName);
+        transferCityThread.setName("TransferCity:" + this.getName());
         transferCityThread.start();
     }
 
@@ -1180,7 +1173,8 @@ public class City extends AbstractWorldObject {
             sourceNation.getSubGuildList().remove(sourceGuild);
 
             if (sourceNation.getSubGuildList().isEmpty())
-                sourceNation.downgradeGuildState();
+                sourceNation.guildState = GuildState.Sovereign;
+
         }
 
         // Link the mew guild with the tree
@@ -1193,7 +1187,7 @@ public class City extends AbstractWorldObject {
         sourceGuild.setCityUUID(this.getObjectUUID());
 
         sourceGuild.setNation(sourceGuild);
-        sourceGuild.setGuildState(GuildState.Sovereign);
+        sourceGuild.guildState = GuildState.Sovereign;
         GuildManager.updateAllGuildTags(sourceGuild);
         GuildManager.updateAllGuildBinds(sourceGuild, this);
 

src/engine/objects/Effect.java

@@ -433,6 +433,12 @@ public class Effect {
         return duration;
     }
 
+    public boolean containsSource(EffectSourceType source) {
+        if (this.eb != null)
+            return this.eb.containsSource(source);
+        return false;
+    }
+
     public JobContainer getJobContainer() {
         return this.jc;
     }

src/engine/objects/Guild.java

@@ -63,7 +63,7 @@ public class Guild extends AbstractWorldObject {
     private ArrayList<Guild> recommendList = new ArrayList<>();
     private ArrayList<Guild> subGuildList;
     private int nationUUID = 0;
-    private GuildState guildState = GuildState.Errant;
+    public GuildState guildState = GuildState.Errant;
     private String hash;
     private boolean ownerIsNPC;
 
@@ -206,23 +206,6 @@ public class Guild extends AbstractWorldObject {
         return a.nation.getObjectUUID() == b.nation.getObjectUUID() && !a.nation.isEmptyGuild();
     }
 
-    public static boolean canSwearIn(Guild toSub) {
-
-        boolean canSwear = false;
-
-        switch (toSub.guildState) {
-
-            case Protectorate:
-            case Petitioner:
-                canSwear = true;
-                break;
-            default:
-                canSwear = false;
-        }
-
-        return canSwear;
-    }
-
     public static void _serializeForClientMsg(Guild guild, ByteBufferWriter writer) {
         Guild.serializeForClientMsg(guild, writer, null, false);
     }
@@ -644,93 +627,15 @@ public class Guild extends AbstractWorldObject {
 
     }
 
-    public void upgradeGuildState(boolean nation) {
-        if (nation) {
-            this.guildState = GuildState.Nation;
-            return;
-        }
-        switch (this.guildState) {
-
-            case Errant:
-                this.guildState = GuildState.Petitioner;
-                break;
-            case Sworn:
-                //Can't upgrade
-                break;
-            case Protectorate:
-                this.guildState = GuildState.Province;
-                break;
-            case Petitioner:
-                this.guildState = GuildState.Sworn;
-                break;
-            case Province:
-                //Can't upgrade
-                break;
-            case Nation:
-                //Can't upgrade
-                break;
-            case Sovereign:
-                this.guildState = GuildState.Protectorate;
-                break;
-        }
-
-    }
-
-    public void downgradeGuildState() {
-
-        switch (this.guildState) {
-            case Errant:
-                break;
-            case Sworn:
-                this.guildState = GuildState.Errant;
-                break;
-            case Protectorate:
-                this.guildState = GuildState.Sovereign;
-                break;
-            case Petitioner:
-                this.guildState = GuildState.Errant;
-                break;
-            case Province:
-                this.guildState = GuildState.Sovereign;
-                break;
-            case Nation:
-                this.guildState = GuildState.Sovereign;
-                break;
-            case Sovereign:
-                this.guildState = GuildState.Errant;
-                break;
-        }
-
-    }
-
     public boolean canSubAGuild(Guild toSub) {
 
-        boolean canSub;
-
         if (this.equals(toSub))
             return false;
-        switch (this.guildState) {
-            case Nation:
-            case Sovereign:
-                canSub = true;
-                break;
-            default:
-                canSub = false;
-        }
 
-        switch (toSub.guildState) {
-            case Errant:
-            case Sovereign:
-                canSub = true;
-                break;
-            default:
-                canSub = false;
-        }
-        City nationCap = City.getCity(nation.cityUUID);
-        if (nation.getSubGuildList().size() >= nationCap.getRank()) {
-            canSub = false;
-        }
-        return canSub;
+        boolean validNation = (this.guildState == GuildState.Nation || this.guildState == GuildState.Sovereign);
+        boolean validProtectorate = (toSub.guildState == GuildState.Errant || toSub.guildState == GuildState.Sovereign);
+
+        return validNation && validProtectorate;
     }
 
     public int getRealmsOwnedFlag() {
@@ -834,18 +739,11 @@ public class Guild extends AbstractWorldObject {
             Logger.error("FAILED TO LOAD SUB GUILDS FOR UUID " + this.getObjectUUID());
         }
 
-        if (this.nation == this && subGuildList.size() > 0)
-            this.guildState = GuildState.Nation;
-        else if (this.nation.equals(this))
-            this.guildState = GuildState.Sovereign;
-        else if (!this.nation.isEmptyGuild() && this.cityUUID != 0)
-            this.guildState = GuildState.Province;
-        else if (!this.nation.isEmptyGuild())
-            this.guildState = GuildState.Sworn;
-        else
-            this.guildState = GuildState.Errant;
+        this.guildState = GuildManager.calcuateGuildState(this);
 
-        if (this.cityUUID == 0)
+        Logger.info(this.name + ":" + this.guildState + ":" + this.nation.name);
+
+        if (this.getOwnedCity() == null)
             return;
 
         // Calculate number of realms this guild controls
@@ -901,14 +799,6 @@ public class Guild extends AbstractWorldObject {
         return motto;
     }
 
-    public GuildState getGuildState() {
-        return guildState;
-    }
-
-    public void setGuildState(GuildState guildState) {
-        this.guildState = guildState;
-    }
-
     /**
      * @return the realmsOwned
      */
@@ -930,18 +820,14 @@ public class Guild extends AbstractWorldObject {
         if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
             Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());
 
-        // Guild without any subs is no longer a nation
-
         if (subGuild.getOwnedCity() == null) {
-            subGuild.nation = null;
+            subGuild.guildState = GuildState.Errant;
+            subGuild.nation = Guild.getErrantNation();
         } else {
             subGuild.nation = subGuild;
+            subGuild.guildState = GuildState.Sovereign;
         }
 
-        // Downgrade guild
-
-        subGuild.downgradeGuildState();
-
         // Remove from collection
 
         subGuildList.remove(subGuild);

src/engine/objects/NPC.java

@@ -512,29 +512,6 @@ public class NPC extends AbstractCharacter {
         return MinionType.ContractToMinionMap.containsKey(contractID);
     }
 
-    public static boolean UpdateEquipSetID(NPC npc, int equipSetID) {
-
-        if (!LootManager._bootySetMap.containsKey(equipSetID))
-            return false;
-
-        if (!DbManager.NPCQueries.UPDATE_EQUIPSET(npc, equipSetID))
-            return false;
-
-        npc.equipmentSetID = equipSetID;
-
-        return true;
-    }
-
-    public static boolean UpdateRaceID(NPC npc, int raceID) {
-
-        if (!DbManager.NPCQueries.UPDATE_MOBBASE(npc, raceID))
-            return false;
-
-        npc.loadID = raceID;
-        npc.mobBase = MobBase.getMobBase(npc.loadID);
-        return true;
-    }
-
     public static NPCProfits GetNPCProfits(NPC npc) {
         return NPCProfits.ProfitCache.get(npc.currentID);
     }

src/engine/powers/EffectsBase.java

@@ -9,6 +9,7 @@
 
 package engine.powers;
 
+import engine.gameManager.DbManager;
 import engine.gameManager.DispatchManager;
 import engine.gameManager.PowersManager;
 import engine.job.JobContainer;
@@ -25,60 +26,63 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.ApplyEffectMsg;
 import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
-import engine.objects.Item;
+import engine.objects.Effect;
 import engine.objects.PlayerCharacter;
-import engine.powers.effectmodifiers.*;
+import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.server.MBServerStatics;
-import engine.util.Hasher;
-import engine.wpak.data.ConditionEntry;
-import engine.wpak.data.Effect;
-import engine.wpak.data.ModifierEntry;
 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.HashMap;
 import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class EffectsBase {
-    private static final ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
-    public static int NewID = 3000;
-    public int UUID;
-    public String IDString;
-    // public String name;
-    public int token;
-    public float amount;
-    public float amountRamp;
+
+    public static HashMap<Integer, HashSet<EffectSourceType>> effectSourceTypeMap = new HashMap<>();
+    public static HashMap<String, HashSet<AbstractEffectModifier>> modifiersMap = new HashMap<>();
+    public static HashMap<String, HashMap<String, ArrayList<String>>> OldEffectsMap = new HashMap<>();
+    public static HashMap<String, HashMap<String, ArrayList<String>>> NewEffectsMap = new HashMap<>();
+    public static HashMap<String, HashMap<String, ArrayList<String>>> ChangedEffectsMap = new HashMap<>();
+    public static HashMap<String, HashSet<PowerFailCondition>> EffectFailConditions = new HashMap<>();
+    public static HashMap<Integer, HashSet<mbEnums.DamageType>> EffectDamageTypes = new HashMap<>();
+    public static HashSet<AbstractEffectModifier> DefaultModifiers = new HashSet<>();
+    private static ConcurrentHashMap<String, String> itemEffectsByName = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
+    private static int NewID = 3000;
+    private int UUID;
+    private String IDString;
+    // private String name;
+    private int token;
+    private float amount;
+    private float amountRamp;
     // flags
-    public boolean isItemEffect;
-    public boolean isSpireEffect;
-    public boolean ignoreNoMod;
-    public boolean dontSave;
-    public boolean cancelOnAttack = false;
-    public boolean cancelOnAttackSwing = false;
-    public boolean cancelOnCast = false;
-    public boolean cancelOnCastSpell = false;
-    public boolean cancelOnEquipChange = false;
-    public boolean cancelOnLogout = false;
-    public boolean cancelOnMove = false;
-    public boolean cancelOnNewCharm = false;
-    public boolean cancelOnSit = false;
-    public boolean cancelOnTakeDamage = false;
-    public boolean cancelOnTerritoryClaim = false;
-    public boolean cancelOnUnEquip = false;
-    public boolean useRampAdd;
-    public boolean isPrefix = false; //used by items
-    public boolean isSuffix = false; //used by items
-    public String name = "";
-    public float value = 0;
+    private boolean isItemEffect;
+    private boolean isSpireEffect;
+    private boolean ignoreMod;
+    private boolean dontSave;
+    private boolean cancelOnAttack = false;
+    private boolean cancelOnAttackSwing = false;
+    private boolean cancelOnCast = false;
+    private boolean cancelOnCastSpell = false;
+    private boolean cancelOnEquipChange = false;
+    private boolean cancelOnLogout = false;
+    private boolean cancelOnMove = false;
+    private boolean cancelOnNewCharm = false;
+    private boolean cancelOnSit = false;
+    private boolean cancelOnTakeDamage = false;
+    private boolean cancelOnTerritoryClaim = false;
+    private boolean cancelOnUnEquip = false;
+    private boolean useRampAdd;
+    private boolean isPrefix = false; //used by items
+    private boolean isSuffix = false; //used by items
+    private String name = "";
+    private float value = 0;
     private ConcurrentHashMap<mbEnums.ResourceType, Integer> resourceCosts = new ConcurrentHashMap<>();
-
-    //loaded values from parser
-    public HashSet<EffectSourceType> effectSources = new HashSet<>();
-    public HashSet<AbstractEffectModifier> effectModifiers = new HashSet<>();
-    public HashSet<PowerFailCondition> effectFailCondition = new HashSet<>();
-
-    public  HashSet<mbEnums.DamageType> effectDamageTypes = new HashSet<>();
+    private ConcurrentHashMap<String, Boolean> sourceTypes = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
 
     /**
      * No Table ID Constructor
@@ -87,110 +91,6 @@ public class EffectsBase {
 
     }
 
-    /**
-     * EffectEntry Constructor
-     */
-
-    public EffectsBase(Effect entry) {
-        this.IDString = entry.effect_id;
-        this.name = entry.effect_name;
-        this.token = Hasher.SBStringHash(entry.effect_name);
-
-        //override tokens for some effects like Safemode that use the Action Token instead of the effect Token,
-        switch (this.IDString) {
-            case "INVIS-D":
-                this.token = -1661751254;
-                break;
-            case "SafeMode":
-                this.token = -1661750486;
-                break;
-
-        }
-        this.isItemEffect = entry.isItemEffect;
-        this.isSpireEffect = entry.isSpireEffect;
-        this.ignoreNoMod = entry.ignoreNoMod;
-        this.dontSave = entry.dontSave;
-
-        if (this.IDString.startsWith("PRE-"))
-            this.isPrefix = true;
-        else if (this.IDString.startsWith("SUF-"))
-            this.isSuffix = true;
-
-        //load effect modifiers
-        for (ModifierEntry mod : entry.mods)
-            this.effectModifiers.add(getCombinedModifiers(null, mod, this, mod.type));
-
-        //load sources
-        for (String source : entry.sources)
-            this.effectSources.add(EffectSourceType.GetEffectSourceType(source));
-
-        //load fail conditions
-        for (ConditionEntry condition : entry.conditions) {
-            PowerFailCondition failCondition = PowerFailCondition.valueOf(condition.condition);
-            this.effectFailCondition.add(failCondition);
-            loadFailConditions(failCondition, this, condition);
-
-            //add all damage types
-            if(!condition.damageTypes.isEmpty())
-                this.effectDamageTypes.addAll(condition.damageTypes);
-        }
-
-
-    }
-
-    public static void loadFailConditions(PowerFailCondition failCondition, EffectsBase eb, ConditionEntry entry) {
-
-        if (failCondition == null || eb == null) {
-            return;
-        }
-
-        switch (failCondition) {
-
-            case TakeDamage:
-
-                eb.cancelOnTakeDamage = true;
-
-
-                eb.amount = entry.arg;
-                eb.amountRamp = (float) entry.curveType.value;
-                eb.useRampAdd = (float) entry.curveType.value != 0;
-                break;
-            case Attack:
-                eb.cancelOnAttack = true;
-                break;
-            case AttackSwing:
-                eb.cancelOnAttackSwing = true;
-                break;
-            case Cast:
-                eb.cancelOnCast = true;
-                break;
-            case CastSpell:
-                eb.cancelOnCastSpell = true;
-                break;
-            case EquipChange:
-                eb.cancelOnEquipChange = true;
-                break;
-            case Logout:
-                eb.cancelOnLogout = true;
-                break;
-            case Move:
-                eb.cancelOnMove = true;
-                break;
-            case NewCharm:
-                eb.cancelOnNewCharm = true;
-                break;
-            case Sit:
-                eb.cancelOnSit = true;
-                break;
-            case TerritoryClaim:
-                eb.cancelOnTerritoryClaim = true;
-                break;
-            case UnEquip:
-                eb.cancelOnUnEquip = true;
-                break;
-        }
-    }
-
     public EffectsBase(EffectsBase copyEffect, int newToken, String IDString) {
 
         UUID = NewID++;
@@ -202,7 +102,7 @@ public class EffectsBase {
             int flags = 0;
             this.isItemEffect = ((flags & 1) != 0) ? true : false;
             this.isSpireEffect = ((flags & 2) != 0) ? true : false;
-            this.ignoreNoMod = ((flags & 4) != 0) ? true : false;
+            this.ignoreMod = ((flags & 4) != 0) ? true : false;
             this.dontSave = ((flags & 8) != 0) ? true : false;
 
             if (this.IDString.startsWith("PRE-"))
@@ -217,7 +117,7 @@ public class EffectsBase {
         this.amountRamp = copyEffect.amountRamp;
         this.isItemEffect = copyEffect.isItemEffect;
         this.isSpireEffect = copyEffect.isSpireEffect;
-        this.ignoreNoMod = copyEffect.ignoreNoMod;
+        this.ignoreMod = copyEffect.ignoreMod;
         this.dontSave = copyEffect.dontSave;
         this.cancelOnAttack = copyEffect.cancelOnAttack;
         this.cancelOnAttackSwing = copyEffect.cancelOnAttackSwing;
@@ -263,7 +163,7 @@ public class EffectsBase {
         int flags = rs.getInt("flags");
         this.isItemEffect = ((flags & 1) != 0) ? true : false;
         this.isSpireEffect = ((flags & 2) != 0) ? true : false;
-        this.ignoreNoMod = ((flags & 4) != 0) ? true : false;
+        this.ignoreMod = ((flags & 4) != 0) ? true : false;
         this.dontSave = ((flags & 8) != 0) ? true : false;
 
         if (this.IDString.startsWith("PRE-"))
@@ -273,6 +173,113 @@ public class EffectsBase {
         // getFailConditions();
     }
 
+    public static void getFailConditions(HashMap<String, EffectsBase> effects) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_failcondition WHERE powerOrEffect = 'Effect';")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            PowerFailCondition failCondition = null;
+
+            while (rs.next()) {
+                String fail = rs.getString("type");
+
+
+                String IDString = rs.getString("IDString");
+                failCondition = PowerFailCondition.valueOf(fail);
+
+                if (failCondition == null) {
+                    Logger.error("Couldn't Find FailCondition " + fail + " for " + IDString);
+                    continue;
+                }
+
+                if (EffectsBase.EffectFailConditions.get(IDString) == null) {
+                    EffectsBase.EffectFailConditions.put(IDString, new HashSet<>());
+                }
+
+                EffectsBase.EffectFailConditions.get(IDString).add(failCondition);
+                EffectsBase eb = effects.get(IDString);
+
+                switch (failCondition) {
+
+                    case TakeDamage:
+
+                        // dont go any further.
+
+                        if (eb == null)
+                            break;
+
+                        eb.cancelOnTakeDamage = true;
+
+
+                        eb.amount = rs.getFloat("amount");
+                        eb.amountRamp = rs.getFloat("ramp");
+                        eb.useRampAdd = rs.getBoolean("UseAddFormula");
+
+                        String damageType1 = rs.getString("damageType1");
+                        String damageType2 = rs.getString("damageType2");
+                        String damageType3 = rs.getString("damageType3");
+
+                        if (damageType1.isEmpty() && damageType2.isEmpty() && damageType3.isEmpty())
+                            break;
+
+                        if (!EffectsBase.EffectDamageTypes.containsKey(eb.getToken()))
+                            EffectsBase.EffectDamageTypes.put(eb.getToken(), new HashSet<>());
+
+                        mbEnums.DamageType dt = mbEnums.DamageType.getDamageType(damageType1);
+                        if (dt != null)
+                            EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
+
+                        dt = mbEnums.DamageType.getDamageType(damageType2);
+                        if (dt != null)
+                            EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
+                        dt = mbEnums.DamageType.getDamageType(damageType3);
+                        if (dt != null)
+                            EffectsBase.EffectDamageTypes.get(eb.token).add(dt);
+                        break;
+                    case Attack:
+                        eb.cancelOnAttack = true;
+                        break;
+                    case AttackSwing:
+                        eb.cancelOnAttackSwing = true;
+                        break;
+                    case Cast:
+                        eb.cancelOnCast = true;
+                        break;
+                    case CastSpell:
+                        eb.cancelOnCastSpell = true;
+                        break;
+                    case EquipChange:
+                        eb.cancelOnEquipChange = true;
+                        break;
+                    case Logout:
+                        eb.cancelOnLogout = true;
+                        break;
+                    case Move:
+                        eb.cancelOnMove = true;
+                        break;
+                    case NewCharm:
+                        eb.cancelOnNewCharm = true;
+                        break;
+                    case Sit:
+                        eb.cancelOnSit = true;
+                        break;
+                    case TerritoryClaim:
+                        eb.cancelOnTerritoryClaim = true;
+                        break;
+                    case UnEquip:
+                        eb.cancelOnUnEquip = true;
+                        break;
+                }
+            }
+
+            rs.close();
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+    }
+
     public static String getItemEffectsByName(String string) {
         if (EffectsBase.itemEffectsByName.containsKey(string))
             return EffectsBase.itemEffectsByName.get(string);
@@ -296,12 +303,14 @@ public class EffectsBase {
 
     public boolean damageTypeSpecific() {
 
-        return !this.effectDamageTypes.isEmpty();
+        return EffectsBase.EffectDamageTypes.containsKey(this.token);
 
     }
 
     public boolean containsDamageType(mbEnums.DamageType dt) {
-        return this.effectDamageTypes.contains(dt);
+        if (!EffectsBase.EffectDamageTypes.containsKey(this.token))
+            return false;
+        return EffectsBase.EffectDamageTypes.get(this.token).contains(dt);
     }
 
     public int getUUID() {
@@ -321,8 +330,32 @@ public class EffectsBase {
         this.token = token;
     }
 
+    public ConcurrentHashMap<String, Boolean> getSourceTypes() {
+        return this.sourceTypes;
+    }
+
     public HashSet<AbstractEffectModifier> getModifiers() {
-        return this.effectModifiers;
+
+        if (EffectsBase.modifiersMap.containsKey(this.IDString) == false)
+            return EffectsBase.DefaultModifiers;
+
+        return EffectsBase.modifiersMap.get(this.IDString);
+    }
+
+    public boolean isItemEffect() {
+        return this.isItemEffect;
+    }
+
+    public boolean isSpireEffect() {
+        return this.isSpireEffect;
+    }
+
+    public boolean ignoreMod() {
+        return this.ignoreMod;
+    }
+
+    public boolean dontSave() {
+        return this.dontSave;
     }
 
     public boolean isPrefix() {
@@ -371,7 +404,7 @@ public class EffectsBase {
                 float duration = ab.getDurationInSeconds(trains);
                 if (pb.getToken() == 1672601862) {
 
-                    engine.objects.Effect eff = awo.getEffects().get("DeathShroud");
+                    Effect eff = awo.getEffects().get("DeathShroud");
 
 
                     if (eff != null) {
@@ -606,6 +639,13 @@ public class EffectsBase {
         }
     }
 
+    public boolean containsSource(EffectSourceType sourceType) {
+        if (EffectsBase.effectSourceTypeMap.containsKey(this.token) == false)
+            return false;
+        return EffectsBase.effectSourceTypeMap.get(this.token).contains(sourceType);
+
+    }
+
     public boolean cancelOnAttack() {
         return this.cancelOnAttack;
     }
@@ -654,6 +694,16 @@ public class EffectsBase {
         return this.cancelOnUnEquip;
     }
 
+    public String getDamageTypes() {
+        String text = "";
+        if (!EffectsBase.EffectDamageTypes.containsKey(this.token))
+            return text;
+        for (mbEnums.DamageType type : EffectsBase.EffectDamageTypes.get(this.token)) {
+            text += type.name() + ' ';
+        }
+        return text;
+    }
+
     public String getName() {
 
         return name;
@@ -663,220 +713,12 @@ public class EffectsBase {
         this.name = name;
     }
 
-    public static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ModifierEntry rs, EffectsBase effectBase, mbEnums.ModType modifier){
-        switch (modifier) {
-            case AdjustAboveDmgCap:
-                abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);
-                break;
-            case Ambidexterity:
-                abstractEffectModifier = new AmbidexterityEffectModifier(rs);
-                break;
-            case AnimOverride:
-                break;
-            case ArmorPiercing:
-                abstractEffectModifier = new ArmorPiercingEffectModifier(rs);
-                break;
-            case AttackDelay:
-                abstractEffectModifier = new AttackDelayEffectModifier(rs);
-                break;
-            case Attr:
-                abstractEffectModifier = new AttributeEffectModifier(rs);
-                break;
-            case BlackMantle:
-                abstractEffectModifier = new BlackMantleEffectModifier(rs);
-                break;
-            case BladeTrails:
-                abstractEffectModifier = new BladeTrailsEffectModifier(rs);
-                break;
-            case Block:
-                abstractEffectModifier = new BlockEffectModifier(rs);
-                break;
-            case BlockedPowerType:
-                abstractEffectModifier = new BlockedPowerTypeEffectModifier(rs);
-                break;
-            case CannotAttack:
-                abstractEffectModifier = new CannotAttackEffectModifier(rs);
-                break;
-            case CannotCast:
-                abstractEffectModifier = new CannotCastEffectModifier(rs);
-                break;
-            case CannotMove:
-                abstractEffectModifier = new CannotMoveEffectModifier(rs);
-                break;
-            case CannotTrack:
-                abstractEffectModifier = new CannotTrackEffectModifier(rs);
-                break;
-            case Charmed:
-                abstractEffectModifier = new CharmedEffectModifier(rs);
-                break;
-            case ConstrainedAmbidexterity:
-                abstractEffectModifier = new ConstrainedAmbidexterityEffectModifier(rs);
-                break;
-            case DamageCap:
-                abstractEffectModifier = new DamageCapEffectModifier(rs);
-                break;
-            case DamageShield:
-                abstractEffectModifier = new DamageShieldEffectModifier(rs);
-                break;
-            case DCV:
-                abstractEffectModifier = new DCVEffectModifier(rs);
-                break;
-            case Dodge:
-                abstractEffectModifier = new DodgeEffectModifier(rs);
-                break;
-            case DR:
-                abstractEffectModifier = new DREffectModifier(rs);
-                break;
-            case Durability:
-                abstractEffectModifier = new DurabilityEffectModifier(rs);
-                break;
-            case ExclusiveDamageCap:
-                abstractEffectModifier = new ExclusiveDamageCapEffectModifier(rs);
-                break;
-            case Fade:
-                abstractEffectModifier = new FadeEffectModifier(rs);
-                break;
-            case Fly:
-                abstractEffectModifier = new FlyEffectModifier(rs);
-                break;
-            case Health:
-                abstractEffectModifier = new HealthEffectModifier(rs);
-                break;
-            case HealthFull:
-                abstractEffectModifier = new HealthFullEffectModifier(rs);
-                break;
-            case HealthRecoverRate:
-                abstractEffectModifier = new HealthRecoverRateEffectModifier(rs);
-                break;
-            case IgnoreDamageCap:
-                abstractEffectModifier = new IgnoreDamageCapEffectModifier(rs);
-                break;
-            case IgnorePassiveDefense:
-                abstractEffectModifier = new IgnorePassiveDefenseEffectModifier(rs);
-                break;
-            case ImmuneTo:
-                abstractEffectModifier = new ImmuneToEffectModifier(rs);
-                break;
-            case ImmuneToAttack:
-                abstractEffectModifier = new ImmuneToAttackEffectModifier(rs);
-                break;
-            case ImmuneToPowers:
-                abstractEffectModifier = new ImmuneToPowersEffectModifier(rs);
-                break;
-            case Invisible:
-                abstractEffectModifier = new InvisibleEffectModifier(rs);
-                break;
-            case ItemName:
-                abstractEffectModifier = new ItemNameEffectModifier(rs);
-                if (((ItemNameEffectModifier) abstractEffectModifier).name.isEmpty())
-                    break;
-                if (effectBase != null)
-                    effectBase.setName((((ItemNameEffectModifier) abstractEffectModifier).name));
-                break;
-            case Mana:
-                abstractEffectModifier = new ManaEffectModifier(rs);
-                break;
-            case ManaFull:
-                abstractEffectModifier = new ManaFullEffectModifier(rs);
-                break;
-            case ManaRecoverRate:
-                abstractEffectModifier = new ManaRecoverRateEffectModifier(rs);
-                break;
-            case MaxDamage:
-                abstractEffectModifier = new MaxDamageEffectModifier(rs);
-                break;
-            case MeleeDamageModifier:
-                abstractEffectModifier = new MeleeDamageEffectModifier(rs);
-                break;
-            case MinDamage:
-                abstractEffectModifier = new MinDamageEffectModifier(rs);
-                break;
-            case NoMod:
-                abstractEffectModifier = new NoModEffectModifier(rs);
-                break;
-            case OCV:
-                abstractEffectModifier = new OCVEffectModifier(rs);
-                break;
-            case Parry:
-                abstractEffectModifier = new ParryEffectModifier(rs);
-                break;
-            case PassiveDefense:
-                abstractEffectModifier = new PassiveDefenseEffectModifier(rs);
-                break;
-            case PowerCost:
-                abstractEffectModifier = new PowerCostEffectModifier(rs);
-                break;
-            case PowerCostHealth:
-                abstractEffectModifier = new PowerCostHealthEffectModifier(rs);
-                break;
-            case PowerDamageModifier:
-                abstractEffectModifier = new PowerDamageEffectModifier(rs);
-                break;
-            case ProtectionFrom:
-                abstractEffectModifier = new ProtectionFromEffectModifier(rs);
-                break;
-            case Resistance:
-                abstractEffectModifier = new ResistanceEffectModifier(rs);
-                break;
-            case ScaleHeight:
-                abstractEffectModifier = new ScaleHeightEffectModifier(rs);
-                break;
-            case ScaleWidth:
-                abstractEffectModifier = new ScaleWidthEffectModifier(rs);
-                break;
-            case ScanRange:
-                abstractEffectModifier = new ScanRangeEffectModifier(rs);
-                break;
-            case SeeInvisible:
-                abstractEffectModifier = new SeeInvisibleEffectModifier(rs);
-                break;
-            case Silenced:
-                abstractEffectModifier = new SilencedEffectModifier(rs);
-                break;
-            case Skill:
-                abstractEffectModifier = new SkillEffectModifier(rs);
-                break;
-            case Slay:
-                abstractEffectModifier = new SlayEffectModifier(rs);
-                break;
-            case Speed:
-                abstractEffectModifier = new SpeedEffectModifier(rs);
-                break;
-            case SpireBlock:
-                abstractEffectModifier = new SpireBlockEffectModifier(rs);
-                break;
-            case Stamina:
-                abstractEffectModifier = new StaminaEffectModifier(rs);
-                break;
-            case StaminaFull:
-                abstractEffectModifier = new StaminaFullEffectModifier(rs);
-                break;
-            case StaminaRecoverRate:
-                abstractEffectModifier = new StaminaRecoverRateEffectModifier(rs);
-                break;
-            case Stunned:
-                abstractEffectModifier = new StunnedEffectModifier(rs);
-                break;
-            case Value:
-                abstractEffectModifier = new ValueEffectModifier(rs);
-                if (effectBase != null) {
-                    ValueEffectModifier valueEffect = (ValueEffectModifier) abstractEffectModifier;
-                    effectBase.value = valueEffect.minMod;
-                    Item.addEnchantValue(effectBase.getIDString(), (int)valueEffect.minMod);
-                }
-                break;
-            case WeaponProc:
-                abstractEffectModifier = new WeaponProcEffectModifier(rs);
-                break;
-            case WeaponRange:
-                abstractEffectModifier = new WeaponRangeEffectModifier(rs);
-                break;
-            case WeaponSpeed:
-                abstractEffectModifier = new WeaponSpeedEffectModifier(rs);
-                break;
+    public float getValue() {
+        return value;
+    }
 
-        }
-        return abstractEffectModifier;
+    public void setValue(float Value) {
+        this.value = Value;
     }
 
 }

src/engine/powers/effectmodifiers/AbstractEffectModifier.java

@@ -17,9 +17,9 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
 
 
 public abstract class AbstractEffectModifier {
@@ -39,24 +39,22 @@ public abstract class AbstractEffectModifier {
     protected String string1;
     protected String string2;
 
-    public AbstractEffectModifier(ResultSet rs){
+    public AbstractEffectModifier(ResultSet rs) throws SQLException {
 
-    }
-    public AbstractEffectModifier(ModifierEntry mod) {
-
-        this.IDString = mod.type.name();
-        this.effectType = mod.type.name();
-        this.modType = mod.type;
-        this.type = mod.type.name().replace("\"", "");
+        this.UUID = rs.getInt("ID");
+        this.IDString = rs.getString("IDString");
+        this.effectType = rs.getString("modType");
+        this.modType = ModType.GetModType(this.effectType);
+        this.type = rs.getString("type").replace("\"", "");
         this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", ""));
-        this.minMod = mod.min;
-        this.maxMod = mod.max;
-        this.percentMod = mod.percentage;
-        this.ramp = (float) mod.compoundCurveType.value;
-        this.useRampAdd = (float) mod.compoundCurveType.value != 0;
+        this.minMod = rs.getFloat("minMod");
+        this.maxMod = rs.getFloat("maxMod");
+        this.percentMod = rs.getFloat("percentMod");
+        this.ramp = rs.getFloat("ramp");
+        this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false;
 
-        this.string1 = mod.arg1;
-        this.string2 = mod.arg2;
+        this.string1 = rs.getString("string1");
+        this.string2 = rs.getString("string2");
     }
 
 

src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -19,7 +18,7 @@ import java.sql.SQLException;
 
 public class AdjustAboveDmgCapEffectModifier extends AbstractEffectModifier {
 
-    public AdjustAboveDmgCapEffectModifier(ModifierEntry rs){
+    public AdjustAboveDmgCapEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java

@@ -13,7 +13,6 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -21,7 +20,7 @@ import java.sql.SQLException;
 
 public class AmbidexterityEffectModifier extends AbstractEffectModifier {
 
-    public AmbidexterityEffectModifier(ModifierEntry rs) {
+    public AmbidexterityEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -19,7 +18,7 @@ import java.sql.SQLException;
 
 public class ArmorPiercingEffectModifier extends AbstractEffectModifier {
 
-    public ArmorPiercingEffectModifier(ModifierEntry rs){
+    public ArmorPiercingEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
 

src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,9 +21,6 @@ public class AttackDelayEffectModifier extends AbstractEffectModifier {
     public AttackDelayEffectModifier(ResultSet rs) throws SQLException {
         super(rs);
     }
-    public AttackDelayEffectModifier(ModifierEntry rs){
-        super(rs);
-    }
 
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {

src/engine/powers/effectmodifiers/AttributeEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class AttributeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public AttributeEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java

@@ -13,8 +13,6 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.mbEnums.SourceType;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
-import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -27,10 +25,6 @@ public class BlackMantleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlackMantleEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class BladeTrailsEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BladeTrailsEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BlockEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class BlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlockEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java

@@ -12,7 +12,6 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.ModType;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public BlockedPowerTypeEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 
@@ -42,7 +37,7 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
 
         for (String effect : ac.getEffects().keySet()) {
             Effect eff = ac.getEffects().get(effect);
-            ModType toBlock = null;
+            ModType toBlock = ModType.None;
 
             switch (this.sourceType) {
                 case Invisible:
@@ -50,10 +45,6 @@ public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier {
                     break;
             }
 
-            if (toBlock == null)
-                return;
-            ;
-                
             HashSet<AbstractEffectModifier> aemList = eff.getEffectModifiers();
             for (AbstractEffectModifier aem : aemList) {
                 if (aem.modType.equals(toBlock)) {

src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class CannotAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotAttackEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CannotCastEffectModifier.java

@@ -12,7 +12,6 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -24,10 +23,6 @@ public class CannotCastEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotCastEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class CannotMoveEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotMoveEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class CannotTrackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CannotTrackEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/CharmedEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class CharmedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public CharmedEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class ConstrainedAmbidexterityEffectModifier extends AbstractEffectModifi
         super(rs);
     }
 
-    public ConstrainedAmbidexterityEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DCVEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class DCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DCVEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DREffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class DREffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DREffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DamageCapEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class DamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DamageCapEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java

@@ -13,7 +13,6 @@ import engine.jobs.AbstractEffectJob;
 import engine.mbEnums;
 import engine.objects.*;
 import engine.powers.DamageShield;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class DamageShieldEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DamageShieldEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DodgeEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class DodgeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DodgeEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/DurabilityEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class DurabilityEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public DurabilityEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class ExclusiveDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ExclusiveDamageCapEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/FadeEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class FadeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public FadeEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/FlyEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class FlyEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public FlyEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -20,7 +20,6 @@ import engine.net.AbstractNetMsg;
 import engine.net.client.msg.ModifyHealthKillMsg;
 import engine.net.client.msg.ModifyHealthMsg;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -42,10 +41,6 @@ public class HealthEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public HealthEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     public static float getMinDamage(float baseMin, float intelligence, float spirit, float focus) {
         float min = baseMin * (((float) Math.pow(intelligence, 0.75f) * 0.0311f) + (0.02f * (int) focus) + ((float) Math.pow(spirit, 0.75f) * 0.0416f));
         return (float) ((int) (min + 0.5f)); //round to nearest whole number

src/engine/powers/effectmodifiers/HealthFullEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class HealthFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public HealthFullEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class HealthRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public HealthRecoverRateEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class IgnoreDamageCapEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public IgnoreDamageCapEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class IgnorePassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public IgnorePassiveDefenseEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ImmuneToAttackEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToAttackEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ImmuneToEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ImmuneToPowersEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ImmuneToPowersEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/InvisibleEffectModifier.java

@@ -16,7 +16,6 @@ import engine.net.client.ClientConnection;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
-import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -28,10 +27,6 @@ public class InvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public InvisibleEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ItemNameEffectModifier.java

@@ -15,7 +15,6 @@ import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
 import engine.powers.EffectsBase;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -123,10 +122,6 @@ public class ItemNameEffectModifier extends AbstractEffectModifier {
         EffectsBase.addItemEffectsByName(n, IDString);
     }
 
-    public ItemNameEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     public String getName() {
         return this.name;
     }

src/engine/powers/effectmodifiers/ManaEffectModifier.java

@@ -21,7 +21,6 @@ import engine.powers.ActionsBase;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.DamageOverTimePowerAction;
 import engine.powers.poweractions.DirectDamagePowerAction;
-import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -44,10 +43,6 @@ public class ManaEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public ManaEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         if (awo == null) {

src/engine/powers/effectmodifiers/ManaFullEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ManaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ManaFullEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ManaRecoverRateEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ManaRecoverRateEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class MaxDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MaxDamageEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class MeleeDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MeleeDamageEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/MinDamageEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class MinDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public MinDamageEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/NoModEffectModifier.java

@@ -12,7 +12,6 @@ package engine.powers.effectmodifiers;
 import engine.jobs.AbstractEffectJob;
 import engine.mbEnums.GameObjectType;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,10 +22,6 @@ public class NoModEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public NoModEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         //TODO check if anything needs removed.

src/engine/powers/effectmodifiers/OCVEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class OCVEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public OCVEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ParryEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ParryEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ParryEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class PassiveDefenseEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PassiveDefenseEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PowerCostEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class PowerCostEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerCostEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class PowerCostHealthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerCostHealthEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class PowerDamageEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public PowerDamageEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ProtectionFromEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ProtectionFromEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ResistanceEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ResistanceEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ResistanceEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class ScaleHeightEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScaleHeightEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java

@@ -14,7 +14,6 @@ import engine.objects.AbstractCharacter;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Building;
 import engine.objects.Item;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -25,10 +24,6 @@ public class ScaleWidthEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScaleWidthEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class ScanRangeEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public ScanRangeEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class SeeInvisibleEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SeeInvisibleEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SilencedEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class SilencedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SilencedEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SkillEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class SkillEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SkillEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SlayEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class SlayEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SlayEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/SpeedEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class SpeedEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SpeedEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         //Logger.error(this.getSimpleClassName(), "Speed applied with " + trains + " trains");

src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class SpireBlockEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public SpireBlockEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
 

src/engine/powers/effectmodifiers/StaminaEffectModifier.java

@@ -21,7 +21,6 @@ import engine.powers.ActionsBase;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.DamageOverTimePowerAction;
 import engine.powers.poweractions.DirectDamagePowerAction;
-import engine.wpak.data.ModifierEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -44,10 +43,6 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
         }
     }
 
-    public StaminaEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
         if (awo == null) {

src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java

@@ -11,7 +11,6 @@ package engine.powers.effectmodifiers;
 
 import engine.jobs.AbstractEffectJob;
 import engine.objects.*;
-import engine.wpak.data.ModifierEntry;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -22,10 +21,6 @@ public class StaminaFullEffectModifier extends AbstractEffectModifier {
         super(rs);
     }
 
-    public StaminaFullEffectModifier(ModifierEntry rs) {
-        super(rs);
-    }
-
     @Override
     protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {