From 873f19db5ee4ecb0511c6678bc2dc5bb227199ac Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Tue, 23 Mar 2021 11:08:25 -0400 Subject: [PATCH] Dirty master (#727) to resolve a dirty master --- .../scala/net/psforever/objects/GlobalDefinitions.scala | 1 - .../definition/converter/OrbitalShuttleConverter.scala | 8 ++------ src/main/scala/net/psforever/zones/Zones.scala | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index 7a9bcc38e..78e5c6b2b 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -1100,7 +1100,6 @@ object GlobalDefinitions { val generator = new GeneratorDefinition(351) val obbasemesh = new AmenityDefinition(598) { } - initMiscellaneous() /* diff --git a/src/main/scala/net/psforever/objects/definition/converter/OrbitalShuttleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/OrbitalShuttleConverter.scala index 69112381f..3535de849 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/OrbitalShuttleConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/OrbitalShuttleConverter.scala @@ -8,13 +8,9 @@ import scala.util.{Failure, Success, Try} class OrbitalShuttleConverter extends ObjectCreateConverter[Vehicle]() { override def ConstructorData(obj: Vehicle): Try[OrbitalShuttleData] = { -// if (obj.MountedIn.nonEmpty) { -// Success(OrbitalShuttleData(obj.Faction, None)) -// } else { - Success(OrbitalShuttleData(obj.Faction, Some(PlacementData(obj.Position, obj.Orientation)))) -// } + Success(OrbitalShuttleData(obj.Faction, Some(PlacementData(obj.Position, obj.Orientation)))) } override def DetailedConstructorData(obj: Vehicle): Try[OrbitalShuttleData] = - Failure(new Exception("OrbitalShuttleConverter should not be used to generate detailed DroppodData (nothing should)")) + Failure(new Exception("OrbitalShuttleConverter should not be used to generate detailed OrbitalShuttleData (nothing should)")) } diff --git a/src/main/scala/net/psforever/zones/Zones.scala b/src/main/scala/net/psforever/zones/Zones.scala index f1f82a07e..8f5a27f5d 100644 --- a/src/main/scala/net/psforever/zones/Zones.scala +++ b/src/main/scala/net/psforever/zones/Zones.scala @@ -14,10 +14,10 @@ import net.psforever.objects.definition.BasicDefinition import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.generator.Generator import net.psforever.objects.serverobject.locks.IFFLock -import net.psforever.objects.serverobject.shuttle.OrbitalShuttlePad import net.psforever.objects.serverobject.pad.{VehicleSpawnPad, VehicleSpawnPadDefinition} import net.psforever.objects.serverobject.painbox.{Painbox, PainboxDefinition} import net.psforever.objects.serverobject.resourcesilo.ResourceSilo +import net.psforever.objects.serverobject.shuttle.OrbitalShuttlePad import net.psforever.objects.serverobject.structures.{Building, BuildingDefinition, FoundationBuilder, StructureType, WarpGate} import net.psforever.objects.serverobject.terminals.capture.{CaptureTerminal, CaptureTerminalDefinition} import net.psforever.objects.serverobject.terminals.implant.ImplantTerminalMech