From 5e3b5e4f915587d10116ccc74b966960f54249a2 Mon Sep 17 00:00:00 2001 From: "Jason_DiDonato@yahoo.com" Date: Tue, 8 Feb 2022 00:46:08 -0500 Subject: [PATCH] ants can now depicot into neutral facilities again --- src/main/scala/net/psforever/objects/Vehicles.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/objects/Vehicles.scala b/src/main/scala/net/psforever/objects/Vehicles.scala index ffb583fc1..417bae3bd 100644 --- a/src/main/scala/net/psforever/objects/Vehicles.scala +++ b/src/main/scala/net/psforever/objects/Vehicles.scala @@ -10,7 +10,7 @@ import net.psforever.objects.serverobject.structures.WarpGate import net.psforever.objects.vehicles._ import net.psforever.objects.zones.Zone import net.psforever.packet.game.TriggeredSound -import net.psforever.types.{DriveState, PlanetSideGUID, Vector3} +import net.psforever.types.{DriveState, PlanetSideEmpire, PlanetSideGUID, Vector3} import net.psforever.services.Service import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage} @@ -397,7 +397,8 @@ object Vehicles { .headOption ) match { case out @ Some(silo: ResourceSilo) - if Vector3.DistanceSquared(position, silo.Position.xy) < radius * radius && obj.Faction == silo.Faction => + if Vector3.DistanceSquared(position, silo.Position.xy) < radius * radius && + silo.Faction == PlanetSideEmpire.NEUTRAL || silo.Faction == obj.Faction => out case _ => None