From 62b839740e16520a5f001e7ce6c2c94a7dd498a9 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Fri, 28 Mar 2025 15:38:54 -0500
Subject: [PATCH] revert new mob AI
---
src/engine/mobileAI/MobAI.java | 4 ++--
src/engine/mobileAI/Threads/MobAIThread.java | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java
index dcb32c68..9a52316b 100644
--- a/src/engine/mobileAI/MobAI.java
+++ b/src/engine/mobileAI/MobAI.java
@@ -758,8 +758,8 @@ public class MobAI {
break;
default:
//SuperSimpleMobAI.run(mob);
- MobHandler.run(mob);
- //DefaultLogic(mob);
+ //MobHandler.run(mob);
+ DefaultLogic(mob);
break;
}
if(mob.isAlive())
diff --git a/src/engine/mobileAI/Threads/MobAIThread.java b/src/engine/mobileAI/Threads/MobAIThread.java
index 8519f413..eee3b1f7 100644
--- a/src/engine/mobileAI/Threads/MobAIThread.java
+++ b/src/engine/mobileAI/Threads/MobAIThread.java
@@ -1,11 +1,11 @@
package engine.mobileAI.Threads;
import engine.gameManager.ConfigManager;
-import engine.gameManager.ZoneManager;
import engine.mobileAI.MobAI;
-import engine.mobileAI.SuperSimpleMobAI;
+import engine.gameManager.ZoneManager;
import engine.objects.Mob;
import engine.objects.Zone;
+import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
public class MobAIThread implements Runnable{
@@ -28,7 +28,7 @@ public class MobAIThread implements Runnable{
AI_BASE_AGGRO_RANGE = (int)(60 * Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue()));
while (true) {
for (Zone zone : ZoneManager.getAllZones()) {
- if (zone != null) {
+ if (zone != null && zone.zoneMobSet != null) {
synchronized (zone.zoneMobSet) {
for (Mob mob : zone.zoneMobSet) {
try {
@@ -41,12 +41,12 @@ public class MobAIThread implements Runnable{
}
}
}
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- Logger.error("AI Thread interrupted", e);
- Thread.currentThread().interrupt();
- }
+ }
+ try {
+ Thread.sleep(1);
+ } catch (InterruptedException e) {
+ Logger.error("AI Thread interrupted", e);
+ Thread.currentThread().interrupt();
}
}
}