PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #418 from Mazo/tower-painbox-fix

Browse source 
Ensure tower pain fields start up correctly
This commit is contained in:
Mazo 2020-05-12 20:43:04 +01:00 • committed by GitHub
commit 42a2512aa0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@ class PainboxControl(painbox: Painbox) extends Actor {
var bBoxMaxCorner = Vector3.Zero var bBoxMaxCorner = Vector3.Zero
var bBoxMidPoint = Vector3.Zero var bBoxMidPoint = Vector3.Zero
var disabled = false // Temporary to disable cavern non-radius fields
def receive: Receive = { def receive: Receive = {
case "startup" => case "startup" =>
if (painbox.Definition.HasNearestDoorDependency) { if (painbox.Definition.HasNearestDoorDependency) {
@ -35,14 +37,12 @@ class PainboxControl(painbox: Painbox) extends Actor {
case _ => case _ =>
log.error(s"Painbox ${painbox.GUID} on ${painbox.Owner.Continent} - ${painbox.Position} can not find a door that it is dependent on") log.error(s"Painbox ${painbox.GUID} on ${painbox.Owner.Continent} - ${painbox.Position} can not find a door that it is dependent on")
} }
} else {
context.become(Stopped)
}
else {
if (painbox.Definition.Radius == 0f) { if (painbox.Definition.Radius == 0f) {
if (painbox.Owner.Continent.matches("c[0-9]")) { if (painbox.Owner.Continent.matches("c[0-9]")) {
// todo: handle non-radius painboxes in caverns properly // todo: handle non-radius painboxes in caverns properly
log.warn(s"Skipping initialization of ${painbox.GUID} on ${painbox.Owner.Continent} - ${painbox.Position}") log.warn(s"Skipping initialization of ${painbox.GUID} on ${painbox.Owner.Continent} - ${painbox.Position}")
disabled = true
} else { } else {
painbox.Owner match { painbox.Owner match {
case obj: Building => case obj: Building =>
@ -83,9 +83,13 @@ class PainboxControl(painbox: Painbox) extends Actor {
case _ => None case _ => None
} }
} }
context.become(Stopped)
} }
} }
if(!disabled) {
context.become(Stopped)
}
case _ => ; case _ => ;
} }