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

Enums are fragile.

Browse Source
This commit is contained in:
MagicBot
2023-08-25 12:32:36 -04:00
parent 719c855bdb
commit ab335aef2a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/Enum.java
+1 -1
View File
@@ -2846,7 +2846,7 @@ public class Enum {
SpellAggroGrouperWimpy(Spell, true, false, true, false, false), SpellAggroGrouperWimpy(Spell, true, false, true, false, false),
//Independent Types //Independent Types
SimpleStandingGuard(null, false, false, false, false, false), SimpleStandingGuard(null, false, false, false, false, false),
Pet(null, false, false, true, false, false), Pet1(null, false, false, true, false, false),
Siege(null, false, false, true, false, false), Siege(null, false, false, true, 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),
src/engine/mobileAI/MobAI.java
+6 -6
View File
@@ -625,7 +625,7 @@ public class MobAI {
//check to send mob home for player guards to prevent exploit of dragging guards away and then teleporting //check to send mob home for player guards to prevent exploit of dragging guards away and then teleporting
if (mob.BehaviourType.equals(Enum.MobBehaviourType.Pet) == false) if (mob.BehaviourType.equals(Enum.MobBehaviourType.Pet1) == false)
CheckToSendMobHome(mob); CheckToSendMobHome(mob);
return; return;
@@ -646,7 +646,7 @@ public class MobAI {
return; return;
} }
if (mob.BehaviourType.equals(Enum.MobBehaviourType.Pet) == false) if (mob.BehaviourType.equals(Enum.MobBehaviourType.Pet1) == false)
CheckToSendMobHome(mob); CheckToSendMobHome(mob);
if (mob.getCombatTarget() != null) { if (mob.getCombatTarget() != null) {
@@ -683,7 +683,7 @@ public class MobAI {
case GuardWallArcher: case GuardWallArcher:
GuardWallArcherLogic(mob); GuardWallArcherLogic(mob);
break; break;
case Pet: case Pet1:
PetLogic(mob); PetLogic(mob);
break; break;
case HamletGuard: case HamletGuard:
@@ -784,7 +784,7 @@ public class MobAI {
switch (mob.BehaviourType) { switch (mob.BehaviourType) {
case Pet: case Pet1:
if (mob.getOwner() == null) if (mob.getOwner() == null)
return; return;
@@ -894,7 +894,7 @@ public class MobAI {
return; return;
if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false && if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false &&
mob.BehaviourType.equals(Enum.MobBehaviourType.Pet) == false) { mob.BehaviourType.equals(Enum.MobBehaviourType.Pet1) == false) {
mob.setCombatTarget(null); mob.setCombatTarget(null);
return; return;
@@ -1014,7 +1014,7 @@ public class MobAI {
if ((aggroMob.agentType.equals(Enum.AIAgentType.GUARD))) if ((aggroMob.agentType.equals(Enum.AIAgentType.GUARD)))
continue; continue;
if (aggroMob.BehaviourType.equals(Enum.MobBehaviourType.Pet)) if (aggroMob.BehaviourType.equals(Enum.MobBehaviourType.Pet1))
continue; continue;
if (mob.getLoc().distanceSquared2D(aggroMob.getLoc()) > sqr(50)) if (mob.getLoc().distanceSquared2D(aggroMob.getLoc()) > sqr(50))
src/engine/objects/Mob.java
+2 -2
View File
@@ -145,7 +145,7 @@ public class Mob extends AbstractIntelligenceAgent {
this.parentZone = parent; this.parentZone = parent;
this.parentZoneUUID = (parent != null) ? parent.getObjectUUID() : 0; this.parentZoneUUID = (parent != null) ? parent.getObjectUUID() : 0;
this.ownerUID = owner.getObjectUUID(); this.ownerUID = owner.getObjectUUID();
this.BehaviourType = Enum.MobBehaviourType.Pet; this.BehaviourType = Enum.MobBehaviourType.Pet1;
clearStatic(); clearStatic();
} }
@@ -797,7 +797,7 @@ public class Mob extends AbstractIntelligenceAgent {
owner.getSiegeMinionMap().put(mob, slot); owner.getSiegeMinionMap().put(mob, slot);
mob.setNpcOwner(owner); mob.setNpcOwner(owner);
mob.BehaviourType = MobBehaviourType.Pet; mob.BehaviourType = MobBehaviourType.Pet1;
mob.BehaviourType.canRoam = false; mob.BehaviourType.canRoam = false;
return mob; return mob;
} }