PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-04-23 13:25:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

exception for non-interference resolves to wrong conclusion

Browse source
This commit is contained in:
Fate-JH 2024-05-10 23:50:00 -04:00
parent 620fe832a5
commit a46643f5be
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/scala/net/psforever/objects/zones/ZoneVehicleActor.scala
View file

@ -133,7 +133,9 @@ object ZoneVehicleActor {
val vPosition = vehicle.Position
val vFaction = vehicle.Faction
val vDefinition = vehicle.Definition
(vDefinition.interference eq Interference.AllowAll) ||
if (vDefinition.interference eq Interference.AllowAll) {
false
} else {
existingInterferences
.collect { case (p, faction, d) if faction == vFaction => (p, d) }
.exists { case (position, definition) =>
@ -143,5 +145,6 @@ object ZoneVehicleActor {
definition == vDefinition && distanceSq < interference.main * interference.main
}
}
}
}
}