PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-03 12:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Painfield fix (#305)

Browse source 
* Fix missing ObjectType on LocalBuildings, causing pain fields to stop working due to no SOI radius being set

* Fix damage logic for pain fields that don't rely on the nearest door
This commit is contained in:
Mazo 2019-12-27 16:48:55 +00:00 • committed by Fate-JH
parent 83ac66a3bf
commit 73298a2e06
18 changed files with 767 additions and 767 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/scala/net/psforever/objects/serverobject/painbox/PainboxControl.scala
View file

@ -37,7 +37,7 @@ class PainboxControl(painbox: Painbox) extends Actor {
//todo: REK boosting
val owner = painbox.Owner.asInstanceOf[Building]
val faction = owner.Faction
if(faction != PlanetSideEmpire.NEUTRAL && nearestDoor.Open.nonEmpty) {
if(faction != PlanetSideEmpire.NEUTRAL && (!painbox.Definition.HasNearestDoorDependency || (painbox.Definition.HasNearestDoorDependency && nearestDoor.Open.nonEmpty))) {
val events = owner.Zone.AvatarEvents
val damage = painbox.Definition.Damage
val radius = painbox.Definition.Radius * painbox.Definition.Radius