MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

replaced MobileFSM.STATE with MobileFSM.MobBehaviourTypes

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-04-11 19:53:13 -05:00
parent 23a07175e5
commit 98f0928a4b
18 changed files with 276 additions and 1331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/powers/poweractions/ApplyEffectPowerAction.java
+2 -2
View File
@@ -125,7 +125,7 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
if (this.effectID.equals("TAUNT")){
if (awo != null && awo.getObjectType() == GameObjectType.Mob){
MobileFSM.setAggro((Mob)awo,source.getObjectUUID());
((Mob) awo).setCombatTarget(source);
ChatSystemMsg msg = ChatManager.CombatInfo(source, awo);
DispatchMessage.sendToAllInRange(source, msg);
}
@@ -252,7 +252,7 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
if (this.effectID.equals("TAUNT")){
if (awo != null && awo.getObjectType() == GameObjectType.Mob){
MobileFSM.setAggro((Mob)awo,source.getObjectUUID());
((Mob) awo).setCombatTarget(source);
ChatSystemMsg msg = ChatManager.CombatInfo(source, awo);
DispatchMessage.sendToAllInRange(source, msg);
}
src/engine/powers/poweractions/ClearAggroPowerAction.java
-2
View File
@@ -10,7 +10,6 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.ai.MobileFSM.STATE;
import engine.math.Vector3fImmutable;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
@@ -32,7 +31,6 @@ public class ClearAggroPowerAction extends AbstractPowerAction {
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (awo != null && awo.getObjectType() == GameObjectType.Mob){
((Mob)awo).setNoAggro(true);
((Mob)awo).state = STATE.Patrol;
}
src/engine/powers/poweractions/ClearNearbyAggroPowerAction.java
-3
View File
@@ -10,11 +10,9 @@
package engine.powers.poweractions;
import engine.Enum.GameObjectType;
import engine.ai.MobileFSM.STATE;
import engine.math.Vector3fImmutable;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.objects.Mob;
import engine.powers.ActionsBase;
import engine.powers.PowersBase;
@@ -31,7 +29,6 @@ public class ClearNearbyAggroPowerAction extends AbstractPowerAction {
@Override
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
if (source.getObjectType() == GameObjectType.Mob){
((Mob)source).state = STATE.Patrol;
}
}
src/engine/powers/poweractions/CreateMobPowerAction.java
-3
View File
@@ -11,7 +11,6 @@ package engine.powers.poweractions;
import engine.Enum;
import engine.InterestManagement.WorldGrid;
import engine.ai.MobileFSM.STATE;
import engine.gameManager.DbManager;
import engine.gameManager.NPCManager;
import engine.gameManager.ZoneManager;
@@ -82,7 +81,6 @@ public class CreateMobPowerAction extends AbstractPowerAction {
if(currentPet!= null && !currentPet.isNecroPet() && !currentPet.isSiege()) {
DbManager.removeFromCache(currentPet);
WorldGrid.RemoveWorldObject(currentPet);
currentPet.state = STATE.Disabled;
currentPet.setCombatTarget(null);
if (currentPet.getParentZone() != null)
@@ -116,7 +114,6 @@ public class CreateMobPowerAction extends AbstractPowerAction {
if(!currentPet.isNecroPet() && !currentPet.isSiege()) {
DbManager.removeFromCache(currentPet);
currentPet.setCombatTarget(null);
currentPet.state = STATE.Disabled;
currentPet.setOwner(null);
WorldGrid.RemoveWorldObject(currentPet);
src/engine/powers/poweractions/MobRecallPowerAction.java
+2 -1
View File
@@ -41,7 +41,8 @@ public class MobRecallPowerAction extends AbstractPowerAction {
MovementManager.translocate(awoac,awoac.getBindLoc(), null);
if (awoac.getObjectType() == GameObjectType.Mob){
MobileFSM.setAwake((Mob)awoac,true);
//MobileFSM.setAwake((Mob)awoac,true);
((Mob)awoac).setCombatTarget(null);
}
src/engine/powers/poweractions/RecallPowerAction.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class RecallPowerAction extends AbstractPowerAction {
awoac.setBindLoc(MBServerStatics.startX, MBServerStatics.startY, MBServerStatics.startZ);
awoac.teleport(awoac.getBindLoc());
if (awoac.getObjectType() == GameObjectType.Mob){
MobileFSM.setAwake((Mob)awoac,true);
((Mob)awoac).setCombatTarget(null);
if (awoac.isAlive())
WorldGrid.updateObject(awoac);
}