PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dirty master (#727)

Browse source 
to resolve a dirty master
This commit is contained in:
Fate-JH 2021-03-23 11:08:25 -04:00 committed by GitHub
parent 71ab35ecab
commit 873f19db5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/scala/net/psforever/objects/GlobalDefinitions.scala
View file

@ -1100,7 +1100,6 @@ object GlobalDefinitions {
val generator = new GeneratorDefinition(351)
val obbasemesh = new AmenityDefinition(598) { }
initMiscellaneous()
/*

8
src/main/scala/net/psforever/objects/definition/converter/OrbitalShuttleConverter.scala
View file

@ -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)"))
}

2
src/main/scala/net/psforever/zones/Zones.scala
View file

@ -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