Merge pull request #72 from Trivernis/develop

Fix #66, #70 Task progress being discarded on resume
Trivernis · Jul 11, 2020 · d078e11 · d078e11
2 parents 602b7c9 + 94f70c3
commit d078e11
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ idea {
 }
 
 group "net.trivernis"
-version "1.2.0"
+version "1.2.1"
 
 sourceCompatibility = 1.8
 

diff --git a/src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationManager.kt b/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)
-            "square" -> Spiral(Pair(center.x, center.z), Pair(center.x, center.z), radius)
-            else -> Spiral(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(start.x, start.z), radius)
+            else -> Spiral(Pair(center.x, center.z), Pair(start.x, start.z), radius)
         }
 
         return if (PaperLib.isPaper()) {

diff --git a/src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskPaper.kt b/src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskPaper.kt
@@ -24,6 +24,7 @@ class GenerationTaskPaper(
 
     init {
         updateGenerationAreaMarker()
+        count = shape.count
     }
 
     /**

diff --git a/src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskSpigot.kt b/src/main/kotlin/net/trivernis/chunkmaster/lib/generation/GenerationTaskSpigot.kt
@@ -19,6 +19,7 @@ class GenerationTaskSpigot(
 
     init {
         updateGenerationAreaMarker()
+        count = shape.count
     }
 
     /**

diff --git a/src/main/resources/plugin.yml b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ class GenerationTaskPaper( @@
         init {
             updateGenerationAreaMarker()
+            count = shape.count
         }
         /**
@@ Expand Down @@