Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/MobBase.java
+17 -17
View File
@@ -10,10 +10,10 @@
package engine.objects;
import ch.claude_martin.enumbitset.EnumBitSet;
import engine.Enum;
import engine.gameManager.DbManager;
import engine.gameManager.LootManager;
import engine.loot.BootySetEntry;
import engine.mbEnums;
import engine.server.MBServerStatics;
import java.sql.ResultSet;
@@ -29,16 +29,16 @@ public class MobBase extends AbstractGameObject {
private final float scale;
public final ArrayList<MobBaseEffects> effectsList;
public int bootySet;
public Enum.MobBehaviourType fsm;
public EnumBitSet<Enum.MonsterType> notEnemy;
public EnumBitSet<Enum.MonsterType> enemy;
public mbEnums.MobBehaviourType fsm;
public EnumBitSet<mbEnums.MonsterType> notEnemy;
public EnumBitSet<mbEnums.MonsterType> enemy;
private float healthMax;
private int attackRating;
private int defenseRating;
private float damageMin;
private float damageMax;
private float hitBoxRadius;
private EnumBitSet<Enum.MobFlagType> flags;
private EnumBitSet<mbEnums.MobFlagType> flags;
private int mask;
private int goldMod;
private int seeInvis;
@@ -74,11 +74,11 @@ public class MobBase extends AbstractGameObject {
this.attackRange = rs.getFloat("attackRange");
this.bootySet = rs.getInt("bootySet");
this.fsm = Enum.MobBehaviourType.valueOf(rs.getString("fsm"));
this.fsm = mbEnums.MobBehaviourType.valueOf(rs.getString("fsm"));
this.flags = EnumBitSet.asEnumBitSet(rs.getLong("flags"), Enum.MobFlagType.class);
this.notEnemy = EnumBitSet.asEnumBitSet(rs.getLong("notEnemy"), Enum.MonsterType.class);
this.enemy = EnumBitSet.asEnumBitSet(rs.getLong("enemy"), Enum.MonsterType.class);
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.seeInvis = rs.getInt("seeInvis");
this.scale = rs.getFloat("scale");
@@ -88,19 +88,19 @@ public class MobBase extends AbstractGameObject {
if (this.getObjectUUID() == 12021 || this.getObjectUUID() == 12022)
this.isNecroPet = true;
if (Enum.MobFlagType.HUMANOID.elementOf(this.flags))
if (mbEnums.MobFlagType.HUMANOID.elementOf(this.flags))
this.mask += MBServerStatics.MASK_HUMANOID;
if (Enum.MobFlagType.UNDEAD.elementOf(this.flags))
if (mbEnums.MobFlagType.UNDEAD.elementOf(this.flags))
this.mask += MBServerStatics.MASK_UNDEAD;
if (Enum.MobFlagType.BEAST.elementOf(this.flags))
if (mbEnums.MobFlagType.BEAST.elementOf(this.flags))
this.mask += MBServerStatics.MASK_BEAST;
if (Enum.MobFlagType.DRAGON.elementOf(this.flags))
if (mbEnums.MobFlagType.DRAGON.elementOf(this.flags))
this.mask += MBServerStatics.MASK_DRAGON;
if (Enum.MobFlagType.RAT.elementOf(this.flags))
if (mbEnums.MobFlagType.RAT.elementOf(this.flags))
this.mask += MBServerStatics.MASK_RAT;
this.mobBaseStats = DbManager.MobBaseQueries.LOAD_STATS(this.loadID);
@@ -110,10 +110,10 @@ public class MobBase extends AbstractGameObject {
}
public static ConcurrentHashMap<Enum.EquipSlotType, Item> loadEquipmentSet(int equipmentSetID) {
public static ConcurrentHashMap<mbEnums.EquipSlotType, Item> loadEquipmentSet(int equipmentSetID) {
ArrayList<BootySetEntry> equipList;
ConcurrentHashMap<Enum.EquipSlotType, Item> equip = new ConcurrentHashMap<>();
ConcurrentHashMap<mbEnums.EquipSlotType, Item> equip = new ConcurrentHashMap<>();
if (equipmentSetID == 0)
return equip;
@@ -203,7 +203,7 @@ public class MobBase extends AbstractGameObject {
return this.defenseRating;
}
public EnumBitSet<Enum.MobFlagType> getFlags() {
public EnumBitSet<mbEnums.MobFlagType> getFlags() {
return this.flags;
}