Fix events not working properly

Author: Sergittos

src/sergittos/bedwars/game/event/presets/UpgradeGeneratorsTierEvent.php

@@ -39,21 +39,20 @@ public function end(): void {
     }
 
     public function getNextEvent(): ?Event {
-        $type = match($this->type) {
+        $next_type = match($this->type) {
             GeneratorType::DIAMOND => GeneratorType::EMERALD,
             GeneratorType::EMERALD => GeneratorType::DIAMOND
         };
+        $next_tier = match($this->tier) {
+            Tier::I => Tier::II,
+            Tier::II => Tier::III,
+            Tier::III => null
+        };
 
-        if($type === GeneratorType::DIAMOND) {
-            $this->tier = match($this->tier) {
-                Tier::I => Tier::II,
-                Tier::II => Tier::III
-            };
-        } elseif($this->tier === Tier::III) {
+        if($next_tier === null) {
             return new BedDestructionEvent();
         }
-
-        return new UpgradeGeneratorsTierEvent($type, $this->tier);
+        return new UpgradeGeneratorsTierEvent($next_type, $next_tier);
     }
 
 }

src/sergittos/bedwars/game/generator/Generator.php

@@ -85,7 +85,7 @@ private function dropItem(World $world): void {
     }
 
     public function reset(): void {
-        $this->setTier(Tier::I);
+        $this->tier = Tier::I;
         $this->setSpeed($this->getInitialSpeed());
     }
 

src/sergittos/bedwars/game/stage/PlayingStage.php

@@ -23,19 +23,19 @@
 
 class PlayingStage extends Stage {
 
-    private Event $next_event;
+    private ?Event $next_event = null;
 
     public function getNextEvent(): Event {
         return $this->next_event;
     }
 
     public function hasStarted(): bool {
-        return isset($this->next_event);
+        return $this->next_event !== null;
     }
 
     private function startNextEvent(?Event $event = null): void {
         $this->next_event = $event ?? $this->next_event->getNextEvent();
-        $this->next_event->start($this->game);
+        $this->next_event?->start($this->game);
     }
 
     protected function onStart(): void {

src/sergittos/bedwars/game/team/Team.php

@@ -16,8 +16,8 @@
 use pocketmine\world\Position;
 use sergittos\bedwars\game\Game;
 use sergittos\bedwars\game\generator\Generator;
+use sergittos\bedwars\game\generator\GeneratorType;
 use sergittos\bedwars\game\team\upgrade\trap\AlarmTrap;
-use sergittos\bedwars\game\team\upgrade\trap\DefaultTrap;
 use sergittos\bedwars\game\team\upgrade\trap\Trap;
 use sergittos\bedwars\session\Session;
 use sergittos\bedwars\utils\ColorUtils;
@@ -158,6 +158,15 @@ public function addGenerator(Generator $generator): void {
         $this->generators[] = $generator;
     }
 
+    private function removeEmeraldGenerator(): void {
+        foreach($this->generators as $index => $generator) {
+            if($generator->getType() === GeneratorType::TEAM_EMERALD) {
+                unset($this->generators[$index]);
+                break;
+            }
+        }
+    }
+
     public function addMember(Session $session): void {
         $this->members[] = $session;
 
@@ -204,6 +213,8 @@ public function reset(): void {
         $this->bed_destroyed = false;
         $this->upgrades = new Upgrades();
 
+        $this->removeEmeraldGenerator();
+
         foreach($this->generators as $generator) {
             $generator->reset();
         }