From ad8218a2ea5de800750ccec80516240e301851b4 Mon Sep 17 00:00:00 2001
From: payonel <payonel@hotmail.com>
Date: Sun, 28 Oct 2018 00:22:15 -0700
Subject: [PATCH] fix the chunkloader upgrade i just broke

---
 .../oc/server/component/UpgradeChunkloader.scala | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala b/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
index 87573be1b..30776df23 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeChunkloader.scala
@@ -65,20 +65,20 @@ class UpgradeChunkloader(val host: EnvironmentHost) extends prefab.ManagedEnviro
     super.onConnect(node)
     if (node == this.node) {
       val restoredTicket = ChunkloaderUpgradeHandler.restoredTickets.remove(node.address)
-      ticket = if (restoredTicket.isDefined) {
+      if (restoredTicket.isDefined) {
         if (!isDimensionAllowed) {
           try ForgeChunkManager.releaseTicket(restoredTicket.get) catch {
             case _: Throwable => // Ignored.
           }
           OpenComputers.log.info(s"Releasing chunk loader ticket at (${host.xPosition()}, ${host.yPosition()}, ${host.zPosition()}) in blacklisted dimension ${host.world().provider.dimensionId}.")
-          None
         } else {
           OpenComputers.log.info(s"Reclaiming chunk loader ticket at (${host.xPosition()}, ${host.yPosition()}, ${host.zPosition()}) in dimension ${host.world().provider.dimensionId}.")
-          restoredTicket
+          ticket = restoredTicket
+          ChunkloaderUpgradeHandler.updateLoadedChunk(this)
         }
       } else host match {
         case context: Context if context.isRunning => requestTicket()
-        case _ => None
+        case _ =>
       }
     }
   }
@@ -105,7 +105,7 @@ class UpgradeChunkloader(val host: EnvironmentHost) extends prefab.ManagedEnviro
 
   private def setActive(enabled: Boolean, throwIfBlocked: Boolean = false) = {
     if (enabled && ticket.isEmpty) {
-      ticket = requestTicket(throwIfBlocked)
+      requestTicket(throwIfBlocked)
       ticket.isDefined
     }
     else if (!enabled && ticket.isDefined) {
@@ -135,16 +135,14 @@ class UpgradeChunkloader(val host: EnvironmentHost) extends prefab.ManagedEnviro
     true
   }
 
-  private def requestTicket(throwIfBlocked: Boolean = false): Option[Ticket] = {
+  private def requestTicket(throwIfBlocked: Boolean = false): Unit = {
     if (!isDimensionAllowed) {
       if (throwIfBlocked) {
         throw new Exception("this dimension is blacklisted")
       }
-      None
     } else {
-      val result = Option(ForgeChunkManager.requestTicket(OpenComputers, host.world, ForgeChunkManager.Type.NORMAL))
+      ticket = Option(ForgeChunkManager.requestTicket(OpenComputers, host.world, ForgeChunkManager.Type.NORMAL))
       ChunkloaderUpgradeHandler.updateLoadedChunk(this)
-      result
     }
   }
 }