From 89a7f180dd5205c060a66c4d2ac76fa086e48e13 Mon Sep 17 00:00:00 2001 From: FateJH Date: Wed, 26 Aug 2020 14:40:16 -0400 Subject: [PATCH] merge rebase hell --- src/main/scala/net/psforever/actors/session/SessionActor.scala | 1 + src/main/scala/net/psforever/objects/avatar/PlayerControl.scala | 2 +- .../net/psforever/objects/ballistics/AggravatedDamage.scala | 0 .../net/psforever/objects/ballistics/ProjectileQuality.scala | 0 .../scala/net/psforever/objects/serverobject/aura/Aura.scala | 0 .../net/psforever/objects/serverobject/aura/AuraContainer.scala | 0 .../objects/serverobject/aura/AuraEffectBehavior.scala | 0 .../objects/serverobject/damage/AggravatedBehavior.scala | 0 .../net/psforever/packet/game/AggravatedDamageMessage.scala | 0 .../test/scala/game/AggravatedDamageMessageTest.scala | 2 +- {common/src => src}/test/scala/objects/AuraTest.scala | 0 11 files changed, 3 insertions(+), 2 deletions(-) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/AggravatedDamage.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/ballistics/ProjectileQuality.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/aura/Aura.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/aura/AuraContainer.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/aura/AuraEffectBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala (100%) rename {common/src => src}/main/scala/net/psforever/packet/game/AggravatedDamageMessage.scala (100%) rename {common/src => src}/test/scala/game/AggravatedDamageMessageTest.scala (100%) rename {common/src => src}/test/scala/objects/AuraTest.scala (100%) diff --git a/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala index fdd13f9d..3e5f5407 100644 --- a/src/main/scala/net/psforever/actors/session/SessionActor.scala +++ b/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 { diff --git a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala index bed0afbb..ffdd20cb 100644 --- a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala +++ b/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)) diff --git a/common/src/main/scala/net/psforever/objects/ballistics/AggravatedDamage.scala b/src/main/scala/net/psforever/objects/ballistics/AggravatedDamage.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/AggravatedDamage.scala rename to src/main/scala/net/psforever/objects/ballistics/AggravatedDamage.scala diff --git a/common/src/main/scala/net/psforever/objects/ballistics/ProjectileQuality.scala b/src/main/scala/net/psforever/objects/ballistics/ProjectileQuality.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/ballistics/ProjectileQuality.scala rename to src/main/scala/net/psforever/objects/ballistics/ProjectileQuality.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/aura/Aura.scala b/src/main/scala/net/psforever/objects/serverobject/aura/Aura.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/aura/Aura.scala rename to src/main/scala/net/psforever/objects/serverobject/aura/Aura.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/aura/AuraContainer.scala b/src/main/scala/net/psforever/objects/serverobject/aura/AuraContainer.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/aura/AuraContainer.scala rename to src/main/scala/net/psforever/objects/serverobject/aura/AuraContainer.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/aura/AuraEffectBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/aura/AuraEffectBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/aura/AuraEffectBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/aura/AuraEffectBehavior.scala diff --git a/common/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala b/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala similarity index 100% rename from common/src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala rename to src/main/scala/net/psforever/objects/serverobject/damage/AggravatedBehavior.scala diff --git a/common/src/main/scala/net/psforever/packet/game/AggravatedDamageMessage.scala b/src/main/scala/net/psforever/packet/game/AggravatedDamageMessage.scala similarity index 100% rename from common/src/main/scala/net/psforever/packet/game/AggravatedDamageMessage.scala rename to src/main/scala/net/psforever/packet/game/AggravatedDamageMessage.scala diff --git a/common/src/test/scala/game/AggravatedDamageMessageTest.scala b/src/test/scala/game/AggravatedDamageMessageTest.scala similarity index 100% rename from common/src/test/scala/game/AggravatedDamageMessageTest.scala rename to src/test/scala/game/AggravatedDamageMessageTest.scala index 61529e56..7cc9783a 100644 --- a/common/src/test/scala/game/AggravatedDamageMessageTest.scala +++ b/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 { diff --git a/common/src/test/scala/objects/AuraTest.scala b/src/test/scala/objects/AuraTest.scala similarity index 100% rename from common/src/test/scala/objects/AuraTest.scala rename to src/test/scala/objects/AuraTest.scala