From 01a8ecd39efbe6e55a59932cd3afe38923a43025 Mon Sep 17 00:00:00 2001
From: Mazo <mazo2@hotmail.com>
Date: Mon, 4 May 2020 13:23:10 +0100
Subject: [PATCH] Ensure tower pain fields start up correctly

---
 .../serverobject/painbox/PainboxControl.scala      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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