#567 Improved cancellation exception handling.

Shynixn · Jan 5, 2024 · f677e6a · f677e6a
1 parent 678373a
commit f677e6a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/docs/wiki/docs/commands.md b/docs/wiki/docs/commands.md
@@ -377,7 +377,7 @@ Rotates the pet to the exact line of the nearest x or z axe.
 * Name: Identifier of a pet
 * Player: Optional player_name/player_UUID parameter targeting a player from the console or command block.
 
-### /petblocks moveforward>
+### /petblocks moveforward
 
 ```
 /petblocks moveforward <name> <speed> [player]
@@ -387,7 +387,7 @@ Lets the pet move forward in its current direction. Executing the snap command b
 move in a straight direction. If the pet reaches a cliff (1 block difference), moving forward stops.
 
 * Name: Identifier of a pet
-* Speed: Speed parameter, should be command values e.g. 0.3
+* Speed: Speed parameter, should be comma values e.g. 0.3
 * Player: Optional player_name/player_UUID parameter targeting a player from the console or command block.
 
 ### /petblocks rotaterel

diff --git a/src/main/java/com/github/shynixn/petblocks/impl/PetEntityImpl.kt b/src/main/java/com/github/shynixn/petblocks/impl/PetEntityImpl.kt
@@ -25,6 +25,7 @@ import com.github.shynixn.petblocks.impl.physic.ArmorstandEntityComponent
 import com.github.shynixn.petblocks.impl.physic.MathComponent
 import com.github.shynixn.petblocks.impl.physic.MoveToTargetComponent
 import com.github.shynixn.petblocks.impl.physic.PlayerComponent
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import org.bukkit.*
 import org.bukkit.block.Block
@@ -87,6 +88,12 @@ class PetEntityImpl(
                     cancellationTokenLoop = CancellationToken()
                     petActionExecutionService.executeAction(pet.player, pet, loop, cancellationTokenLoop)
                     delay(1.ticks)
+                } catch (e: CancellationException) {
+                    // Ignore Coroutine Cancel
+                    break
+                } catch (e: IllegalStateException) {
+                    // Ignore Coroutine Cancel
+                    break
                 } catch (e: Exception) {
                     plugin.logger.log(Level.SEVERE, "Cannot execute pet loop '${pet.loop}'.", e)
                     break
@@ -257,7 +264,7 @@ class PetEntityImpl(
         cancellationTokenLongRunning.isCancelled = true
         cancellationTokenLongRunning = CancellationToken()
 
-        val token =  cancellationTokenLongRunning
+        val token = cancellationTokenLongRunning
 
         plugin.launch {
             while (true) {