From 14da36dabe86e3e025a7f3be5402596d2fd30dbd Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Tue, 3 Mar 2026 15:53:16 -0500
Subject: [PATCH] prefacing imports with _root_ to escape name conflict with
 nested package

---
 src/test/scala/service/HartServiceTest.scala |  2 +-
 src/test/scala/service/HartTimerTest.scala   | 26 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/test/scala/service/HartServiceTest.scala b/src/test/scala/service/HartServiceTest.scala
index 3952a8f7a..c0a4a33c3 100644
--- a/src/test/scala/service/HartServiceTest.scala
+++ b/src/test/scala/service/HartServiceTest.scala
@@ -3,7 +3,7 @@ package service
 
 import akka.actor.{ActorRef, Props}
 import akka.testkit.TestProbe
-import base.ActorTest
+import _root_.base.ActorTest
 import net.psforever.objects.zones.{Zone, ZoneMap}
 import net.psforever.services.hart.{HartService, HartTimer}
 import net.psforever.types.PlanetSideGUID
diff --git a/src/test/scala/service/HartTimerTest.scala b/src/test/scala/service/HartTimerTest.scala
index 038909b17..486d88dd0 100644
--- a/src/test/scala/service/HartTimerTest.scala
+++ b/src/test/scala/service/HartTimerTest.scala
@@ -1,9 +1,9 @@
 // Copyright (c) 2021 PSForever
 package service
 
-import akka.actor.Props
+import akka.actor.{ActorRef, Props}
 import akka.testkit.TestProbe
-import base.ActorTest
+import _root_.base.ActorTest
 import net.psforever.objects.zones.{Zone, ZoneMap}
 import net.psforever.services.hart.HartTimer
 import net.psforever.types.PlanetSideGUID
@@ -14,11 +14,11 @@ class HartTimerNotScheduled extends ActorTest {
   "HartTimer" should {
     val catchall = new TestProbe(system).ref
     val zone = new Zone("test", new ZoneMap("test"), 0) {
-      override def SetupNumberPools() = {}
-      override def AvatarEvents = catchall
-      override def LocalEvents = catchall
-      override def VehicleEvents = catchall
-      override def Activity = catchall
+      override def SetupNumberPools(): Unit = {}
+      override def AvatarEvents: ActorRef = catchall
+      override def LocalEvents: ActorRef = catchall
+      override def VehicleEvents: ActorRef = catchall
+      override def Activity: ActorRef = catchall
     }
     val timer = system.actorOf(Props(classOf[HartTimer], zone), "hart-timer")
 
@@ -34,11 +34,11 @@ class HartTimerInitializedPairingScheduled extends ActorTest {
   "HartTimer" should {
     val catchall = new TestProbe(system).ref
     val zone = new Zone("test", new ZoneMap("test"), 0) {
-      override def SetupNumberPools() = {}
-      override def AvatarEvents = catchall
-      override def LocalEvents = catchall
-      override def VehicleEvents = catchall
-      override def Activity = catchall
+      override def SetupNumberPools(): Unit = {}
+      override def AvatarEvents: ActorRef = catchall
+      override def LocalEvents: ActorRef = catchall
+      override def VehicleEvents: ActorRef = catchall
+      override def Activity: ActorRef = catchall
     }
     val timer = system.actorOf(Props(classOf[HartTimer], zone), "hart-timer")
 
@@ -54,4 +54,4 @@ class HartTimerInitializedPairingScheduled extends ActorTest {
   }
 }
 
-object HartTimerTest { /* initially left empty */ }
+object HartTimerTest { /* initially left empty */ }
\ No newline at end of file