Browse Source

none to enum MonsterType

master
FatBoy-DOTC 2 years ago
parent
commit
ae968211ab
  1. 1
      src/engine/Enum.java
  2. 1
      src/engine/objects/Mob.java
  3. 6
      src/engine/objects/MobBase.java

1
src/engine/Enum.java

@ -50,6 +50,7 @@ public class Enum { @@ -50,6 +50,7 @@ public class Enum {
}
public enum MonsterType implements EnumBitSetHelper<MonsterType> {
None,
Aelfborn,
All,
Animal,

1
src/engine/objects/Mob.java

@ -1720,7 +1720,6 @@ public class Mob extends AbstractIntelligenceAgent { @@ -1720,7 +1720,6 @@ public class Mob extends AbstractIntelligenceAgent {
}
// Combine mobbase and mob aggro arrays into one bitvector
EnumBitSet<Enum.MonsterType> notEnemyTester = this.getMobBase().notEnemy;
this.notEnemy.addAll(this.getMobBase().notEnemy);
this.enemy.addAll(this.getMobBase().enemy);

6
src/engine/objects/MobBase.java

@ -109,13 +109,7 @@ public class MobBase extends AbstractGameObject { @@ -109,13 +109,7 @@ public class MobBase extends AbstractGameObject {
}
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class);
if(rs.getLong("notEnemy") == 0)
this.notEnemy = EnumBitSet.noneOf(Enum.MonsterType.class);
else
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
if(rs.getLong("enemy") == 0)
this.enemy = EnumBitSet.noneOf(Enum.MonsterType.class);
else
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
this.seeInvis = rs.getInt("seeInvis");

Loading…
Cancel
Save