MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

refactored out dependency

Browse Source
This commit is contained in:
MagicBot
2024-04-05 08:44:59 -04:00
parent d3d1227d6c
commit 0b4873a522
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mbEnums.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class mbEnums {
} }
public enum MobFlagType implements EnumBitSetHelper<MobFlagType> { public enum MobFlagType {
AGGRESSIVE, AGGRESSIVE,
CANROAM, CANROAM,
CALLSFORHELP, CALLSFORHELP,
src/engine/mobileAI/utilities/MovementUtilities.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class MovementUtilities {
public static boolean canMove(Mob agent) { public static boolean canMove(Mob agent) {
if (agent.getMobBase() != null && mbEnums.MobFlagType.SENTINEL.elementOf(agent.getMobBase().getFlags())) if (agent.getMobBase() != null && agent.getMobBase().getFlags().contains(mbEnums.MobFlagType.SENTINEL))
return false; return false;
return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.CannotMove, SourceType.None)); return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.CannotMove, SourceType.None));
src/engine/objects/MobBase.java
+8 -9
View File
@@ -9,7 +9,6 @@
package engine.objects; package engine.objects;
import ch.claude_martin.enumbitset.EnumBitSet;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.LootManager; import engine.gameManager.LootManager;
import engine.loot.BootySetEntry; import engine.loot.BootySetEntry;
@@ -39,7 +38,7 @@ public class MobBase extends AbstractGameObject {
private float damageMin; private float damageMin;
private float damageMax; private float damageMax;
private float hitBoxRadius; private float hitBoxRadius;
private EnumBitSet<mbEnums.MobFlagType> flags; private EnumSet<mbEnums.MobFlagType> flags;
private int mask; private int mask;
private int goldMod; private int goldMod;
private int seeInvis; private int seeInvis;
@@ -77,7 +76,7 @@ public class MobBase extends AbstractGameObject {
this.fsm = mbEnums.MobBehaviourType.valueOf(rs.getString("fsm")); this.fsm = mbEnums.MobBehaviourType.valueOf(rs.getString("fsm"));
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), mbEnums.MobFlagType.class); this.flags = mbEnums.fromLong(rs.getLong("flags"), mbEnums.MobFlagType.class);
this.notEnemy = mbEnums.fromLong(rs.getLong("notEnemy"), mbEnums.MonsterType.class); this.notEnemy = mbEnums.fromLong(rs.getLong("notEnemy"), mbEnums.MonsterType.class);
this.enemy = mbEnums.fromLong(rs.getLong("enemy"), mbEnums.MonsterType.class); this.enemy = mbEnums.fromLong(rs.getLong("enemy"), mbEnums.MonsterType.class);
@@ -89,19 +88,19 @@ public class MobBase extends AbstractGameObject {
if (this.getObjectUUID() == 12021 || this.getObjectUUID() == 12022) if (this.getObjectUUID() == 12021 || this.getObjectUUID() == 12022)
this.isNecroPet = true; this.isNecroPet = true;
if (mbEnums.MobFlagType.HUMANOID.elementOf(this.flags)) if (this.flags.contains(mbEnums.MobFlagType.HUMANOID))
this.mask += MBServerStatics.MASK_HUMANOID; this.mask += MBServerStatics.MASK_HUMANOID;
if (mbEnums.MobFlagType.UNDEAD.elementOf(this.flags)) if (this.flags.contains(mbEnums.MobFlagType.UNDEAD))
this.mask += MBServerStatics.MASK_UNDEAD; this.mask += MBServerStatics.MASK_UNDEAD;
if (mbEnums.MobFlagType.BEAST.elementOf(this.flags)) if (this.flags.contains(mbEnums.MobFlagType.BEAST))
this.mask += MBServerStatics.MASK_BEAST; this.mask += MBServerStatics.MASK_BEAST;
if (mbEnums.MobFlagType.DRAGON.elementOf(this.flags)) if (this.flags.contains(mbEnums.MobFlagType.DRAGON))
this.mask += MBServerStatics.MASK_DRAGON; this.mask += MBServerStatics.MASK_DRAGON;
if (mbEnums.MobFlagType.RAT.elementOf(this.flags)) if (this.flags.contains(mbEnums.MobFlagType.RAT))
this.mask += MBServerStatics.MASK_RAT; this.mask += MBServerStatics.MASK_RAT;
this.mobBaseStats = DbManager.MobBaseQueries.LOAD_STATS(this.loadID); this.mobBaseStats = DbManager.MobBaseQueries.LOAD_STATS(this.loadID);
@@ -204,7 +203,7 @@ public class MobBase extends AbstractGameObject {
return this.defenseRating; return this.defenseRating;
} }
public EnumBitSet<mbEnums.MobFlagType> getFlags() { public EnumSet<mbEnums.MobFlagType> getFlags() {
return this.flags; return this.flags;
} }