From be57c845a68b1e0ae6dedc270cad5e9f328afa6e Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Sun, 27 Oct 2024 18:54:07 -0500 Subject: [PATCH] Fixed some inspections and compile warnings --- pswgcommon | 2 +- .../holocore/resources/support/npc/ai/NpcCombatMode.kt | 5 ----- .../holocore/services/gameplay/player/quest/QuestService.kt | 2 -- .../services/support/npc/spawn/DynamicSpawnService.kt | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pswgcommon b/pswgcommon index a7c00aeb4..736353e27 160000 --- a/pswgcommon +++ b/pswgcommon @@ -1 +1 @@ -Subproject commit a7c00aeb4e4aa31b27f4a621831f8db541ec85ae +Subproject commit 736353e2729ca50903299bb3b2b4cf8d6ee76f69 diff --git a/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.kt b/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.kt index 6a3d942c6..e5886bb5c 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.kt +++ b/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.kt @@ -28,12 +28,10 @@ package com.projectswg.holocore.resources.support.npc.ai import com.projectswg.common.data.encodables.oob.StringId import com.projectswg.common.data.encodables.tangible.Posture import com.projectswg.common.data.location.Location -import com.projectswg.common.data.location.Point3D import com.projectswg.common.network.packets.swg.zone.object_controller.ShowFlyText import com.projectswg.holocore.intents.support.global.command.QueueCommandIntent import com.projectswg.holocore.intents.support.npc.ai.ScheduleNpcModeIntent import com.projectswg.holocore.intents.support.npc.ai.StartNpcCombatIntent -import com.projectswg.holocore.intents.support.npc.ai.StartNpcMovementIntent import com.projectswg.holocore.intents.support.npc.ai.StopNpcMovementIntent import com.projectswg.holocore.intents.support.objects.MoveObjectIntent import com.projectswg.holocore.resources.support.color.SWGColor @@ -44,13 +42,10 @@ import com.projectswg.holocore.resources.support.objects.swg.custom.AIBehavior import com.projectswg.holocore.resources.support.objects.swg.custom.AIObject import com.projectswg.holocore.resources.support.objects.swg.custom.NpcMode import com.projectswg.holocore.resources.support.objects.swg.weapon.WeaponObject -import java.util.* import java.util.concurrent.CopyOnWriteArraySet import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.atomic.AtomicReference -import kotlin.math.cos -import kotlin.math.sin class NpcCombatMode(obj: AIObject) : NpcMode(obj) { diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/player/quest/QuestService.kt b/src/main/java/com/projectswg/holocore/services/gameplay/player/quest/QuestService.kt index faf532fb3..643fb9027 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/player/quest/QuestService.kt +++ b/src/main/java/com/projectswg/holocore/services/gameplay/player/quest/QuestService.kt @@ -66,8 +66,6 @@ import com.projectswg.holocore.resources.support.random.RandomDie import me.joshlarson.jlcommon.concurrency.ScheduledThreadPool import me.joshlarson.jlcommon.control.IntentHandler import me.joshlarson.jlcommon.control.Service -import me.joshlarson.jlcommon.log.Log -import java.lang.IndexOutOfBoundsException import java.util.concurrent.ThreadLocalRandom class QuestService(private val destroyMultiAndLootDie: Die = RandomDie(), private val retrieveItemDie: Die = RandomDie()) : Service() { diff --git a/src/main/java/com/projectswg/holocore/services/support/npc/spawn/DynamicSpawnService.kt b/src/main/java/com/projectswg/holocore/services/support/npc/spawn/DynamicSpawnService.kt index 0526dca39..f88b8d61c 100644 --- a/src/main/java/com/projectswg/holocore/services/support/npc/spawn/DynamicSpawnService.kt +++ b/src/main/java/com/projectswg/holocore/services/support/npc/spawn/DynamicSpawnService.kt @@ -39,7 +39,6 @@ import com.projectswg.holocore.resources.support.data.server_info.loader.ServerD import com.projectswg.holocore.resources.support.data.server_info.loader.npc.NpcStaticSpawnLoader.SpawnerFlag import com.projectswg.holocore.resources.support.data.server_info.mongodb.PswgDatabase.config import com.projectswg.holocore.resources.support.npc.spawn.SimpleSpawnInfo -import com.projectswg.holocore.resources.support.npc.spawn.Spawner import com.projectswg.holocore.resources.support.npc.spawn.SpawnerType import com.projectswg.holocore.resources.support.objects.swg.SWGObject import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureDifficulty