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

revert new mob AI

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-28 15:30:12 -05:00
parent 4d79d17582
commit ca12c7d864
3 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mobileAI/MobAI.java
+4 -1
View File
@@ -14,6 +14,7 @@ import engine.InterestManagement.WorldGrid;
import engine.gameManager.*; import engine.gameManager.*;
import engine.math.Vector3f; import engine.math.Vector3f;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.mobileAI.MobHandlers.MobHandler;
import engine.mobileAI.Threads.MobAIThread; import engine.mobileAI.Threads.MobAIThread;
import engine.mobileAI.utilities.CombatUtilities; import engine.mobileAI.utilities.CombatUtilities;
import engine.mobileAI.utilities.MovementUtilities; import engine.mobileAI.utilities.MovementUtilities;
@@ -756,7 +757,9 @@ public class MobAI {
HamletGuardLogic(mob); HamletGuardLogic(mob);
break; break;
default: default:
DefaultLogic(mob); //SuperSimpleMobAI.run(mob);
MobHandler.run(mob);
//DefaultLogic(mob);
break; break;
} }
if(mob.isAlive()) if(mob.isAlive())
src/engine/mobileAI/Threads/MobAIThread.java
-28
View File
@@ -34,34 +34,6 @@ public class MobAIThread implements Runnable{
try { try {
if (mob != null) { if (mob != null) {
MobAI.DetermineAction(mob); MobAI.DetermineAction(mob);
//if(mob.isSiege() || mob.isPet() || mob.isPlayerGuard()){
// SuperSimpleMobAI.run(mob);
// return;
//}
//boolean override;
//switch (mob.BehaviourType) {
// case GuardCaptain:
// case GuardMinion:
// case GuardWallArcher:
// case Pet1:
// case HamletGuard:
// override = false;
// break;
// default:
// override = true;
// break;
//}
// if(mob.isSiege())
// override = false;
//if(mob.isPet())
// override = false;
//if(override){
// SuperSimpleMobAI.run(mob);
// return;
//}
} }
} catch (Exception e) { } catch (Exception e) {
Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e); Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e);
src/engine/objects/AbstractCharacter.java
+2 -10
View File
@@ -1465,12 +1465,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
if (eff == null) if (eff == null)
continue; continue;
boolean cancelOnAttack = eff.cancelOnAttack(); if (eff.cancelOnAttack() && eff.cancel()) {
if(s.equals("Invisible"))
cancelOnAttack = true;
if (cancelOnAttack && eff.cancel()) {
eff.cancelJob(); eff.cancelJob();
this.effects.remove(s); this.effects.remove(s);
changed = true; changed = true;
@@ -1565,10 +1560,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
override = true; override = true;
} }
Boolean cancelOnMove = eff.cancelOnMove(); if (!override && eff.cancelOnMove() && eff.cancel()) {
if(s.equals("SafeMode") || eff.getEffectsBase().getUUID() == 961)
cancelOnMove = true;
if (!override && cancelOnMove && eff.cancel()) {
//System.out.println("canceling on Move"); //System.out.println("canceling on Move");
eff.cancelJob(); eff.cancelJob();
this.effects.remove(s); this.effects.remove(s);