PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-20 02:24:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #986 from Fate-JH/ant-neut-fac-fix

Browse source 
Ants Can Now Deposit into Neutral Facilities Again
This commit is contained in:
Fate-JH 2022-02-08 01:16:09 -05:00 committed by GitHub
parent f1a9809c54 5e3b5e4f91
commit 2b58d126b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats 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.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