merge rebase hell

src/main/scala/net/psforever/actors/session/SessionActor.scala

@@ -77,6 +77,7 @@ import net.psforever.services.vehicle.{VehicleAction, VehicleResponse, VehicleSe
 import net.psforever.services.{InterstellarClusterService, RemoverActor, Service, ServiceManager}
 import net.psforever.types._
 import net.psforever.util.{Config, DefinitionUtil}
+import net.psforever.zones.Zones
 
 object SessionActor {
 

src/main/scala/net/psforever/objects/avatar/PlayerControl.scala

@@ -929,7 +929,7 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm
   }
 
   def UpdateAuraEffect(target: AuraEffectBehavior.Target) : Unit = {
-    import services.avatar.{AvatarAction, AvatarServiceMessage}
+    import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage}
     val zone = target.Zone
     val value = target.Aura.foldLeft(0)(_ + PlayerControl.auraEffectToAttributeValue(_))
     zone.AvatarEvents ! AvatarServiceMessage(zone.id, AvatarAction.PlanetsideAttributeToAll(target.GUID, 54, value))

src/test/scala/game/AggravatedDamageMessageTest.scala

@@ -1,10 +1,10 @@
 // Copyright (c) 2020 PSForever
 package game
 
-import org.specs2.mutable._
 import net.psforever.packet._
 import net.psforever.packet.game._
 import net.psforever.types.PlanetSideGUID
+import org.specs2.mutable._
 import scodec.bits._
 
 class AggravatedDamageMessageTest extends Specification {