PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-14 16:04:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ants can now depicot into neutral facilities again

Browse source
This commit is contained in:
Jason_DiDonato@yahoo.com 2022-02-08 00:46:08 -05:00
parent f1a9809c54
commit 5e3b5e4f91
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/scala/net/psforever/objects/Vehicles.scala
View file

@ -10,7 +10,7 @@ import net.psforever.objects.serverobject.structures.WarpGate
import net.psforever.objects.vehicles._ import net.psforever.objects.vehicles._
import net.psforever.objects.zones.Zone import net.psforever.objects.zones.Zone
import net.psforever.packet.game.TriggeredSound 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.Service
import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage} import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage}
import net.psforever.services.local.{LocalAction, LocalServiceMessage} import net.psforever.services.local.{LocalAction, LocalServiceMessage}
@ -397,7 +397,8 @@ object Vehicles {
.headOption .headOption
) match { ) match {
case out @ Some(silo: ResourceSilo) 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 out
case _ => case _ =>
None None