Do some minor changes from last commits

Sergittos · Jan 24, 2024 · 00b4cd2 · 00b4cd2
1 parent 641e2ff
commit 00b4cd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/sergittos/bedwars/game/stage/PlayingStage.php b/src/sergittos/bedwars/game/stage/PlayingStage.php
@@ -69,10 +69,10 @@ public function onQuit(Session $session): void {
         $session->resetSettings();
         $session->setTrackingSession(null);
 
-        if ($session->getTeam() !== null) {
+        if($session->hasTeam()) {
             $team = $session->getTeam();
             $team->removeMember($session);
-            if (!$team->isAlive()) {
+            if(!$team->isAlive()) {
                 $this->game->broadcastMessage("{BOLD}{WHITE}TEAM ELIMINATED > {RESET}" . $team->getColoredName() . " Team {RED}has been eliminated!");
             }
         }

diff --git a/src/sergittos/bedwars/listener/GameListener.php b/src/sergittos/bedwars/listener/GameListener.php
@@ -187,17 +187,14 @@ public function onPlace(BlockPlaceEvent $event): void {
             return;
         }
 
-        foreach ($event->getTransaction()->getBlocks() as [$x, $y, $z, $block]) {
-            if ($block instanceof TNT) {
-                $world = $block->getPosition()->getWorld();
-                if ($world !== null && $world->isLoaded()) {
-                    BedWars::getInstance()->getScheduler()->scheduleDelayedTask(new ClosureTask(function () use ($block) {
-                        // Ensure the world is still loaded when the task runs
-                        if ($block->getPosition()->getWorld() !== null) {
-                            $block->ignite(60);
-                        }
-                    }), 1);
-                }
+        foreach($event->getTransaction()->getBlocks() as [$x, $y, $z, $block]) {
+            if($block instanceof TNT) {
+                BedWars::getInstance()->getScheduler()->scheduleDelayedTask(new ClosureTask(function () use ($block) {
+                    $world = $block->getPosition()->world;
+                    if($world !== null and $world->isLoaded()) {
+                        $block->ignite(60);
+                    }
+                }), 1);
                 continue;
             }
             $session->getGame()->addBlock($block->getPosition());