From f07d7f3fe9f4cee1161304ae93a172fb72ade019 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sat, 24 Oct 2026 09:11:30 -0400 Subject: [PATCH] Remove the dead static_npc_mob_resists loader AbstractCharacter.getResists fell back to Resists.getResists(0), but the table has no ID 0, so the fallback always returned null. It now returns the field directly. Removes dbResistHandler, the cache, the ResultSet constructor and the empty setMobResists stub. No value change. Co-Authored-By: Claude Opus 5.5 --- src/engine/db/handlers/dbResistHandler.java | 47 ------------------- src/engine/gameManager/DbManager.java | 1 - src/engine/objects/AbstractCharacter.java | 2 - src/engine/objects/Resists.java | 51 --------------------- 4 files changed, 101 deletions(-) delete mode 100644 src/engine/db/handlers/dbResistHandler.java diff --git a/src/engine/db/handlers/dbResistHandler.java b/src/engine/db/handlers/dbResistHandler.java deleted file mode 100644 index 826733a0..00000000 --- a/src/engine/db/handlers/dbResistHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2026 -// https://www.magicbane.com - - -package engine.db.handlers; - -import engine.gameManager.DbManager; -import engine.objects.Resists; -import org.pmw.tinylog.Logger; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -public class dbResistHandler extends dbHandlerBase { - - public dbResistHandler() { - - } - - public Resists GET_RESISTS_FOR_MOB(int resistID) { - - Resists resists = null; - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_mob_resists` WHERE `ID` = ?;")) { - - preparedStatement.setInt(1, resistID); - - ResultSet rs = preparedStatement.executeQuery(); - - if (rs.next()) - resists = new Resists(rs); - - } catch (SQLException e) { - Logger.error(e); - } - - return resists; - } -} diff --git a/src/engine/gameManager/DbManager.java b/src/engine/gameManager/DbManager.java index b0ce3036..688cd84e 100644 --- a/src/engine/gameManager/DbManager.java +++ b/src/engine/gameManager/DbManager.java @@ -57,7 +57,6 @@ public enum DbManager { public static final dbPlayerCharacterHandler PlayerCharacterQueries = new dbPlayerCharacterHandler(); public static final dbPromotionClassHandler PromotionQueries = new dbPromotionClassHandler(); public static final dbRaceHandler RaceQueries = new dbRaceHandler(); - public static final dbResistHandler ResistQueries = new dbResistHandler(); public static final dbRuneBaseHandler RuneBaseQueries = new dbRuneBaseHandler(); public static final dbSkillBaseHandler SkillsBaseQueries = new dbSkillBaseHandler(); public static final dbSkillReqHandler SkillReqQueries = new dbSkillReqHandler(); diff --git a/src/engine/objects/AbstractCharacter.java b/src/engine/objects/AbstractCharacter.java index 5849e0e1..f4037d52 100644 --- a/src/engine/objects/AbstractCharacter.java +++ b/src/engine/objects/AbstractCharacter.java @@ -1257,8 +1257,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject { } public final Resists getResists() { - if (this.resists == null) - return Resists.getResists(0); return this.resists; } diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index 15f990ed..e19cb60d 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -10,15 +10,12 @@ package engine.objects; import engine.gameManager.ChatManager; -import engine.gameManager.DbManager; import engine.mbEnums; import engine.mbEnums.ModType; import engine.mbEnums.SourceType; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.EnumMap; import java.util.HashSet; import java.util.Iterator; @@ -26,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; public class Resists { - private static ConcurrentHashMap mobResists = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); private ConcurrentHashMap resists = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); private ConcurrentHashMap immuneTo = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW); private mbEnums.DamageType protection; @@ -79,26 +75,6 @@ public class Resists { setGenericResists(); } - /** - * Database Constructor - */ - public Resists(ResultSet rs) throws SQLException { - this.immuneToAll = false; - this.resists.put(mbEnums.DamageType.SLASHING, rs.getFloat("slash")); - this.resists.put(mbEnums.DamageType.CRUSHING, rs.getFloat("crush")); - this.resists.put(mbEnums.DamageType.PIERCING, rs.getFloat("pierce")); - this.resists.put(mbEnums.DamageType.MAGIC, rs.getFloat("magic")); - this.resists.put(mbEnums.DamageType.BLEEDING, rs.getFloat("bleed")); - this.resists.put(mbEnums.DamageType.POISON, rs.getFloat("poison")); - this.resists.put(mbEnums.DamageType.MENTAL, rs.getFloat("mental")); - this.resists.put(mbEnums.DamageType.HOLY, rs.getFloat("holy")); - this.resists.put(mbEnums.DamageType.UNHOLY, rs.getFloat("unholy")); - this.resists.put(mbEnums.DamageType.LIGHTNING, rs.getFloat("lightning")); - this.resists.put(mbEnums.DamageType.FIRE, rs.getFloat("fire")); - this.resists.put(mbEnums.DamageType.COLD, rs.getFloat("cold")); - this.resists.put(mbEnums.DamageType.HEALING, 0f); - } - //Handle Fortitudes private static float handleFortitude(AbstractCharacter target, mbEnums.DamageType type, float damage) { if (target == null || !(target.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))) @@ -175,25 +151,6 @@ public class Resists { return phys; } - /** - * Get mob resists from db if there, otherwise set defaults - */ - public static Resists getResists(int resistID) { - //check cache first - if (mobResists.containsKey(resistID)) - return new Resists(mobResists.get(resistID)); - - //get from database - Resists resists = DbManager.ResistQueries.GET_RESISTS_FOR_MOB(resistID); - if (resists != null) { - mobResists.put(resistID, resists); - return new Resists(resists); - } - - //failed, may want to debug this - return null; - } - /** * Create generic resists for buildings */ @@ -314,14 +271,6 @@ public class Resists { this.immuneToAll = value; } - /** - * set resists from mobbase - */ - public void setMobResists(int resistID) { - //TODO add this in later - //calls `static_npc_mob_resists` table WHERE `ID`='resistID' - } - /** * get Damage after resist * Expects heals as negative damage and damage as positive damage for fortitudes.