From 1fb2d8cadf686835998d3b0f80b2e2260c2c3320 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Tue, 8 Aug 2023 10:39:19 -0400 Subject: [PATCH] Power loading work. --- src/engine/db/handlers/dbPowerHandler.java | 2 +- src/engine/gameManager/PowersManager.java | 4 +--- src/engine/objects/Mob.java | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/engine/db/handlers/dbPowerHandler.java b/src/engine/db/handlers/dbPowerHandler.java index b1fe5636..18088913 100644 --- a/src/engine/db/handlers/dbPowerHandler.java +++ b/src/engine/db/handlers/dbPowerHandler.java @@ -86,7 +86,7 @@ public class dbPowerHandler extends dbHandlerBase { } } - public HashMap> LOAD_MOB_POWERS() { + public static HashMap> LOAD_MOB_POWERS() { HashMap> mobPowers = new HashMap<>(); MobPowerEntry mobPowerEntry; diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index eec316dd..4bc2d34c 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -27,7 +27,6 @@ import engine.net.client.ClientConnection; import engine.net.client.msg.*; import engine.objects.*; import engine.powers.*; -import engine.powers.effectmodifiers.AbstractEffectModifier; import engine.powers.poweractions.AbstractPowerAction; import engine.powers.poweractions.TrackPowerAction; import engine.server.MBServerStatics; @@ -53,9 +52,8 @@ public enum PowersManager { public static HashMap powerActionsByIDString = new HashMap<>(); public static HashMap powerActionsByID = new HashMap<>(); public static HashMap ActionTokenByIDString = new HashMap<>(); - public static HashMap modifiersByToken = new HashMap<>(); public static HashMap AnimationOverrides = new HashMap<>(); - public static HashMap> AllMobPowers = new HashMap<>(); + public static HashMap> AllMobPowers; private static JobScheduler js; private PowersManager() { diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index 1619b44b..2038c7c5 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -1946,7 +1946,6 @@ public class Mob extends AbstractIntelligenceAgent { } catch (Exception e) { Logger.error(e.getMessage()); } - mobPowers = new HashMap<>(); // Powers from mobbase