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

fixed repair silos (for ground vehicles) with logic (#1031)

Browse source
This commit is contained in:
Fate-JH 2023-02-18 08:58:06 -05:00 committed by GitHub
parent 09172edcd9
commit 3f07dbe8ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/scala/net/psforever/objects/equipment/EffectTarget.scala
View file

@ -65,10 +65,10 @@ object EffectTarget {
private def CommonRepairConditions(v: Vehicle): Boolean = { private def CommonRepairConditions(v: Vehicle): Boolean = {
v.Health > 0 && v.Health < v.MaxHealth && v.Health > 0 && v.Health < v.MaxHealth &&
v.History.findLast { entry => entry.isInstanceOf[DamagingActivity] }.exists { (v.History.findLast { entry => entry.isInstanceOf[DamagingActivity] } match {
case entry if System.currentTimeMillis() - entry.time < 5000L => true case Some(entry) if System.currentTimeMillis() - entry.time < 5000L => false
case _ => false case _ => true
} })
} }
def Player(target: PlanetSideGameObject): Boolean = def Player(target: PlanetSideGameObject): Boolean =
@ -140,7 +140,7 @@ object EffectTarget {
def AncientWeaponRecharge(target: PlanetSideGameObject): Boolean = { def AncientWeaponRecharge(target: PlanetSideGameObject): Boolean = {
target match { target match {
case p: Player => case p: Player =>
(p.Holsters().map { _.Equipment }.flatten.toIterable ++ p.Inventory.Items.map { _.obj }) (p.Holsters().flatMap { _.Equipment }.toIterable ++ p.Inventory.Items.map { _.obj })
.flatMap { .flatMap {
case weapon: Tool => weapon.AmmoSlots case weapon: Tool => weapon.AmmoSlots
case _ => Nil case _ => Nil