From 57b5cef021cb09c184f9437e279bfa1be38f3026 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 26 Mar 2024 12:47:26 -0500 Subject: [PATCH] mob spawn revert --- src/engine/mobileAI/MobAI.java | 8 ++++---- src/engine/objects/Mob.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/mobileAI/MobAI.java b/src/engine/mobileAI/MobAI.java index 7d9fb9d4..d20b6043 100644 --- a/src/engine/mobileAI/MobAI.java +++ b/src/engine/mobileAI/MobAI.java @@ -851,7 +851,7 @@ public class MobAI { if (!aiAgent.despawned) { if (aiAgent.getCharItemManager().getInventoryCount() > 0) { - if (System.currentTimeMillis() > (aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER_WITH_LOOT) * 0.5f) { + if (System.currentTimeMillis() > aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER_WITH_LOOT) { aiAgent.despawn(); aiAgent.deathTime = System.currentTimeMillis(); return; @@ -860,21 +860,21 @@ public class MobAI { } else { //Mob's Loot has been looted. if (aiAgent.isHasLoot()) { - if (System.currentTimeMillis() > (aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER_ONCE_LOOTED) * 0.5f) { + if (System.currentTimeMillis() > aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER_ONCE_LOOTED) { aiAgent.despawn(); aiAgent.deathTime = System.currentTimeMillis(); return; } //Mob never had Loot. } else { - if (System.currentTimeMillis() > (aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER) * 0.5f) { + if (System.currentTimeMillis() > aiAgent.deathTime + MBServerStatics.DESPAWN_TIMER) { aiAgent.despawn(); aiAgent.deathTime = System.currentTimeMillis(); return; } } } - } else if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000) * 0.5f)) { + } else if (System.currentTimeMillis() > aiAgent.deathTime + (aiAgent.spawnTime * 1000)) { if (Zone.respawnQue.contains(aiAgent) == false) { Zone.respawnQue.add(aiAgent); diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index aeefc8e1..aa6e9309 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -195,7 +195,7 @@ public class Mob extends AbstractIntelligenceAgent { this.loadID = rs.getInt("mob_mobbaseID"); this.gridObjectType = GridObjectType.DYNAMIC; this.spawnRadius = rs.getFloat("mob_spawnRadius"); - this.spawnTime = (int)(rs.getInt("mob_spawnTime") * 0.5); + this.spawnTime = rs.getInt("mob_spawnTime"); this.parentZone = null; this.statLat = rs.getFloat("mob_spawnX"); this.statAlt = rs.getFloat("mob_spawnY");