Merge pull request #72 from Trivernis/develop

Fix #66, #70 Task progress being discarded on resume

build.gradle

@@ -22,7 +22,7 @@ idea {
 }
 
 group "net.trivernis"
-version "1.2.0"
+version "1.2.1"
 
 sourceCompatibility = 1.8
 

src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationManager.kt

@@ -343,9 +343,9 @@ class GenerationManager(private val chunkmaster: Chunkmaster, private val server
         shapeName: String
     ): GenerationTask {
         val shape = when (shapeName) {
-            "circle" -> Circle(Pair(center.x, center.z), Pair(center.x, center.z), radius)
+            "circle" -> Circle(Pair(center.x, center.z), Pair(start.x, start.z), radius)
-            "square" -> Spiral(Pair(center.x, center.z), Pair(center.x, center.z), radius)
+            "square" -> Spiral(Pair(center.x, center.z), Pair(start.x, start.z), radius)
-            else -> Spiral(Pair(center.x, center.z), Pair(center.x, center.z), radius)
+            else -> Spiral(Pair(center.x, center.z), Pair(start.x, start.z), radius)
         }
 
         return if (PaperLib.isPaper()) {

src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskPaper.kt

@@ -24,6 +24,7 @@ class GenerationTaskPaper(
 
     init {
         updateGenerationAreaMarker()
+        count = shape.count
     }
 
     /**

src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskSpigot.kt

@@ -19,6 +19,7 @@ class GenerationTaskSpigot(
 
     init {
         updateGenerationAreaMarker()
+        count = shape.count
     }
 
     /**

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 main: net.trivernis.chunkmaster.Chunkmaster
 name: Chunkmaster
-version: '1.2.0'
+version: '1.2.1'
 description: Chunk commands plugin.
 author: Trivernis
 website: trivernis.net