From 77468013719b9a81cb87ed861198702df563d0ff Mon Sep 17 00:00:00 2001 From: Mazo Date: Tue, 12 Jun 2018 17:38:31 +0100 Subject: [PATCH] Move new services from master merge to common --- {pslogin => common}/src/main/scala/services/RemoverActor.scala | 0 .../main/scala/services/avatar/support/DroppedItemRemover.scala | 2 +- .../main/scala/services/vehicle/support/VehicleRemover.scala | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {pslogin => common}/src/main/scala/services/RemoverActor.scala (100%) rename {pslogin => common}/src/main/scala/services/avatar/support/DroppedItemRemover.scala (100%) rename {pslogin => common}/src/main/scala/services/vehicle/support/VehicleRemover.scala (100%) diff --git a/pslogin/src/main/scala/services/RemoverActor.scala b/common/src/main/scala/services/RemoverActor.scala similarity index 100% rename from pslogin/src/main/scala/services/RemoverActor.scala rename to common/src/main/scala/services/RemoverActor.scala diff --git a/pslogin/src/main/scala/services/avatar/support/DroppedItemRemover.scala b/common/src/main/scala/services/avatar/support/DroppedItemRemover.scala similarity index 100% rename from pslogin/src/main/scala/services/avatar/support/DroppedItemRemover.scala rename to common/src/main/scala/services/avatar/support/DroppedItemRemover.scala index 01bc9d47f..ce91fdf81 100644 --- a/pslogin/src/main/scala/services/avatar/support/DroppedItemRemover.scala +++ b/common/src/main/scala/services/avatar/support/DroppedItemRemover.scala @@ -3,8 +3,8 @@ package services.avatar.support import net.psforever.objects.equipment.Equipment import net.psforever.objects.guid.{GUIDTask, TaskResolver} -import services.avatar.{AvatarAction, AvatarServiceMessage} import services.{RemoverActor, Service} +import services.avatar.{AvatarAction, AvatarServiceMessage} import scala.concurrent.duration._ diff --git a/pslogin/src/main/scala/services/vehicle/support/VehicleRemover.scala b/common/src/main/scala/services/vehicle/support/VehicleRemover.scala similarity index 100% rename from pslogin/src/main/scala/services/vehicle/support/VehicleRemover.scala rename to common/src/main/scala/services/vehicle/support/VehicleRemover.scala index cec2e65e2..b60c9356b 100644 --- a/pslogin/src/main/scala/services/vehicle/support/VehicleRemover.scala +++ b/common/src/main/scala/services/vehicle/support/VehicleRemover.scala @@ -4,8 +4,8 @@ package services.vehicle.support import net.psforever.objects.Vehicle import net.psforever.objects.guid.{GUIDTask, TaskResolver} import net.psforever.objects.zones.Zone -import services.vehicle.{VehicleAction, VehicleServiceMessage} import services.{RemoverActor, Service} +import services.vehicle.{VehicleAction, VehicleServiceMessage} import scala.concurrent.duration._