forked from MagicBane/Server
Enum moved to Enum.
Updated logic in rs constructor to handle blanks properly.
This commit is contained in:
@@ -11,7 +11,6 @@ package engine.objects;
|
||||
|
||||
import ch.claude_martin.enumbitset.EnumBitSet;
|
||||
import engine.Enum;
|
||||
import engine.ai.MobileFSM;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.gameManager.NPCManager;
|
||||
import engine.server.MBServerStatics;
|
||||
@@ -61,7 +60,7 @@ public class MobBase extends AbstractGameObject {
|
||||
private float walkCombat = 0;
|
||||
private float runCombat = 0;
|
||||
public int bootySet;
|
||||
public MobileFSM.MobBehaviourType fsm;
|
||||
public Enum.MobBehaviourType fsm;
|
||||
|
||||
public EnumBitSet<Enum.MonsterType> notEnemy;
|
||||
public EnumBitSet<Enum.MonsterType> enemy;
|
||||
@@ -90,7 +89,7 @@ public class MobBase extends AbstractGameObject {
|
||||
this.defenseRating = rs.getInt("defense");
|
||||
this.attackRange = rs.getFloat("attackRange");
|
||||
this.bootySet = rs.getInt("bootySet");
|
||||
this.fsm = MobileFSM.MobBehaviourType.valueOf(rs.getString("fsm"));
|
||||
this.fsm = Enum.MobBehaviourType.getByName(rs.getString("fsm"));
|
||||
|
||||
if (MobbaseGoldEntry.MobbaseGoldMap.containsKey(this.loadID)){
|
||||
MobbaseGoldEntry goldEntry = MobbaseGoldEntry.MobbaseGoldMap.get(this.loadID);
|
||||
|
||||
Reference in New Issue
Block a user