added none to behaviour type for mobs and defuated RS constructor for mobs

This commit is contained in:
2023-04-15 20:03:17 -05:00
parent f75323e7e2
commit 98eb557c58
2 changed files with 4 additions and 3 deletions
+3 -2
View File
@@ -59,7 +59,8 @@ public class MobileFSM {
Pet1(null, false, false, false, false, false), Pet1(null, false, false, false, false, false),
Simple(null, false, false, true, false, false), Simple(null, false, false, true, false, false),
Helpee(null, false, true, true, false, true), Helpee(null, false, true, true, false, true),
HelpeeWimpy(null, true, false, true, false, false); HelpeeWimpy(null, true, false, true, false, false),
None(null, false, false, false, false, false);
private static HashMap<Integer, MobBehaviourType> _behaviourTypes = new HashMap<>(); private static HashMap<Integer, MobBehaviourType> _behaviourTypes = new HashMap<>();
public MobBehaviourType BehaviourHelperType; public MobBehaviourType BehaviourHelperType;
@@ -565,7 +566,7 @@ public class MobileFSM {
} }
} }
public static void run(Mob mob) { public static void run(Mob mob) {
if (mob == null) { if (mob == null || mob.BehaviourType == MobBehaviourType.None) {
return; return;
} }
//add default behaviour type //add default behaviour type
+1 -1
View File
@@ -296,7 +296,7 @@ public class Mob extends AbstractIntelligenceAgent {
if(rs.getString("fsm").length() > 1) { if(rs.getString("fsm").length() > 1) {
this.BehaviourType = MobileFSM.MobBehaviourType.valueOf(rs.getString("fsm")); this.BehaviourType = MobileFSM.MobBehaviourType.valueOf(rs.getString("fsm"));
} else{ } else{
this.BehaviourType = MobileFSM.MobBehaviourType.Simple; this.BehaviourType = MobileFSM.MobBehaviourType.None;
} }
} catch (Exception e) { } catch (Exception e) {
Logger.error(currentID + ""); Logger.error(currentID + "");