Release V1.5.2 (bug fix update)

- Tasks are now properly cancelled
supercrafter333 · Dec 4, 2021 · cf28b3b · cf28b3b
1 parent 490d831
commit cf28b3b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/.changlogs.md b/.changlogs.md
@@ -130,4 +130,10 @@ End of theSpawn PM3 support
 ### Changelog V1.5.0 » V1.5.1
 > This version doesn't contain any major code changes from the previous version. It's only a bug fix update.
 - *[FIX]* - Fixed a bug on player respawn
+- *[VERSION]* - Version bump
+
+
+### Changelog V1.5.1 » V1.5.2
+> This version doesn't contain any major code changes from the previous version. It's only a bug fix update.
+- *[FIX]* - Tasks are now properly canceled
 - *[VERSION]* - Version bump
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/ca6cWPpERp)
-# theSpawn - V1.5.1   [![](https://poggit.pmmp.io/shield.state/theSpawn)](https://poggit.pmmp.io/p/theSpawn) [![](https://poggit.pmmp.io/shield.dl.total/theSpawn)](https://poggit.pmmp.io/p/theSpawn)
+# theSpawn - V1.5.2   [![](https://poggit.pmmp.io/shield.state/theSpawn)](https://poggit.pmmp.io/p/theSpawn) [![](https://poggit.pmmp.io/shield.dl.total/theSpawn)](https://poggit.pmmp.io/p/theSpawn)
 
 **This plugin will replace MSpawns! Help me to make this plugin better!**
 

diff --git a/plugin.yml b/plugin.yml
@@ -1,5 +1,5 @@
 name: theSpawn
-version: 1.5.0
+version: 1.5.2
 api: 4.0.0
 main: supercrafter333\theSpawn\theSpawn
 author: supercrafter333

diff --git a/resources/Languages/messages.yml b/resources/Languages/messages.yml
@@ -96,7 +96,7 @@ no-spawn-set-for-world: "§cThere's no spawn set for world {world}!"
 
 
 #don't change this
-version: "1.5.1"
+version: "1.5.2"
 
 
 ############################

diff --git a/resources/config.yml b/resources/config.yml
@@ -49,7 +49,7 @@ language: "en_BE"
 
 
 #DON'T CHANGE THIS!!
-version: "1.5.1"
+version: "1.5.2"
 
 ############################
 ##########theSpawn##########

diff --git a/src/supercrafter333/theSpawn/Tasks/TpaTask.php b/src/supercrafter333/theSpawn/Tasks/TpaTask.php
@@ -28,18 +28,18 @@ public function onRun(): void
         if ($this->tpa->getSourceAsPlayer() == null && $this->tpa->getTargetAsPlayer() instanceof Player) {
             $this->tpa->getTargetAsPlayer()->sendMessage(str_replace("{source}", $this->tpa->getSource(), MsgMgr::getMsg("tpa-cancelled-by-source")));
             theSpawn::getInstance()->removeTpa($this->tpa->getSource());
-            $this->onCancel();
+            $this->getHandler()->cancel();
             return;
         }
         if ($this->tpa->getTargetAsPlayer() == null && $this->tpa->getSourceAsPlayer() instanceof Player) {
             $this->tpa->getSourceAsPlayer()->sendMessage(str_replace("{target}", $this->tpa->getTarget(), MsgMgr::getMsg("tpa-cancelled-by-target")));
             theSpawn::getInstance()->removeTpa($this->tpa->getSource());
-            $this->onCancel();
+            $this->getHandler()->cancel();
             return;
         }
         if ($this->tpa->getTargetAsPlayer() == null && $this->tpa->getSourceAsPlayer() == null) {
             theSpawn::getInstance()->removeTpa($this->tpa->getSource());
-            $this->onCancel();
+            $this->getHandler()->cancel();
             return;
         }
         if ($this->seconds > 10) {
@@ -51,7 +51,7 @@ public function onRun(): void
             $this->seconds--;
         } elseif ($this->seconds <= 0) {
             $this->tpa->getTargetAsPlayer()->sendMessage(str_replace(["{target}", "{source}"], [$this->tpa->getTarget(), $this->tpa->getSource()], MsgMgr::getMsg("tpa-ended")));
-            $this->onCancel();
+            $this->getHandler()->cancel();
         }
     }
 }
diff --git a/src/supercrafter333/theSpawn/theSpawn.php b/src/supercrafter333/theSpawn/theSpawn.php
@@ -84,7 +84,7 @@ class theSpawn extends PluginBase implements Listener
     /**
      * @var string
      */
-    public string $version = "1.5.1";
+    public string $version = "1.5.2";
 
 
     /**
@@ -1164,7 +1164,7 @@ public function stopSpawnDelay(Player $player): bool
         if (!isset($this->spawnDelays[$player->getName()])) return false;
         $task = $this->spawnDelays["task"];
         if ($task instanceof Task) {
-            $task->onCancel();
+            $task->getHandler()->cancel();
         }
         unset($this->spawnDelays[$player->getName()]);
         return true;