refactored out dependency

This commit is contained in:
2024-04-05 08:35:48 -04:00
parent 181e7661c1
commit d3d1227d6c
4 changed files with 11 additions and 12 deletions
+5 -4
View File
@@ -19,6 +19,7 @@ import engine.server.MBServerStatics;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.concurrent.ConcurrentHashMap;
public class MobBase extends AbstractGameObject {
@@ -30,8 +31,8 @@ public class MobBase extends AbstractGameObject {
public final ArrayList<MobBaseEffects> effectsList;
public int bootySet;
public mbEnums.MobBehaviourType fsm;
public EnumBitSet<mbEnums.MonsterType> notEnemy;
public EnumBitSet<mbEnums.MonsterType> enemy;
public EnumSet<mbEnums.MonsterType> notEnemy;
public EnumSet<mbEnums.MonsterType> enemy;
private float healthMax;
private int attackRating;
private int defenseRating;
@@ -77,8 +78,8 @@ public class MobBase extends AbstractGameObject {
this.fsm = mbEnums.MobBehaviourType.valueOf(rs.getString("fsm"));
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), mbEnums.MobFlagType.class);
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), mbEnums.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), mbEnums.MonsterType.class);
this.notEnemy = mbEnums.fromLong(rs.getLong("notEnemy"), mbEnums.MonsterType.class);
this.enemy = mbEnums.fromLong(rs.getLong("enemy"), mbEnums.MonsterType.class);
this.seeInvis = rs.getInt("seeInvis");
this.scale = rs.getFloat("scale");