Fix players receiving multiple messages when joining a game

Author: Sergittos

src/sergittos/bedwars/game/entity/shop/Villager.php

@@ -39,6 +39,10 @@ protected function getInitialDragMultiplier(): float {
         return 0.02;
     }
 
+    public function canSaveWithChunk(): bool {
+        return true;
+    }
+
     protected function initEntity(CompoundTag $nbt): void {
         parent::initEntity($nbt);
 
@@ -51,6 +55,8 @@ public function attack(EntityDamageEvent $source): void {
             return;
         }
 
+        $source->cancel();
+
         $damager = $source->getDamager();
         if($damager instanceof Player and SessionFactory::hasSession($damager)) {
             $damager->sendForm($this->getForm(SessionFactory::getSession($damager)));

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

@@ -7,14 +7,16 @@
 
 
 use pocketmine\world\sound\ClickSound;
-use sergittos\bedwars\session\scoreboard\WaitingScoreboard;
+use sergittos\bedwars\game\stage\trait\JoinableTrait;
 use sergittos\bedwars\session\Session;
-use sergittos\bedwars\utils\ConfigGetter;
 use sergittos\bedwars\utils\GameUtils;
 use function str_replace;
-use function strtoupper;
 
 class StartingStage extends Stage {
+    use JoinableTrait {
+        onJoin as onSessionJoin;
+        onQuit as onSessionQuit;
+    }
 
     private int $time = 10;
 
@@ -23,21 +25,13 @@ public function getTime(): int {
     }
 
     public function onJoin(Session $session): void {
-        $session->showBossBar("{YELLOW}Playing {WHITE}BED WARS {YELLOW}on {GREEN}" . strtoupper(ConfigGetter::getIP()));
-        $session->getPlayer()->getEffects()->clear();
-        $session->giveWaitingItems();
-        $session->setGame($this->game);
-        $session->setScoreboard(new WaitingScoreboard());
-        $session->teleportToWaitingWorld();
-
-        $this->game->broadcastMessage(
-            "{GRAY}" . $session->getUsername() . " {YELLOW}has joined ({AQUA}" .
-            $this->game->getPlayersCount() . "{YELLOW}/{AQUA}" . $this->game->getMap()->getMaxCapacity() . "{YELLOW})!"
-        );
+        if(!$this->justStarted()) {
+            $this->onSessionJoin($session);
+        }
     }
 
     public function onQuit(Session $session): void {
-        $this->game->broadcastMessage("{GRAY}" . $session->getUsername() . " {YELLOW}has quit!");
+        $this->onSessionQuit($session);
 
         if(!$this->game->isFull()) {
             $this->game->setStage(new WaitingStage());
@@ -78,4 +72,8 @@ private function broadcastCountdownTitle(): void {
         $this->game->broadcastSound(new ClickSound());
     }
 
+    private function justStarted(): bool {
+        return $this->time === 10;
+    }
+
 }

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

@@ -7,30 +7,24 @@
 
 
 use sergittos\bedwars\game\Game;
-use sergittos\bedwars\session\scoreboard\WaitingScoreboard;
+use sergittos\bedwars\game\stage\trait\JoinableTrait;
 use sergittos\bedwars\session\Session;
-use sergittos\bedwars\utils\ConfigGetter;
-use function strtoupper;
 
 class WaitingStage extends Stage {
+    use JoinableTrait {
+        onJoin as onSessionJoin;
+    }
 
     public function start(Game $game): void {
         $this->game = $game;
     }
 
     public function onJoin(Session $session): void {
-        $session->showBossBar("{YELLOW}Playing {WHITE}BED WARS {YELLOW}on {GREEN}" . strtoupper(ConfigGetter::getIP()));
-        $session->getPlayer()->getEffects()->clear();
-        $session->giveWaitingItems();
-        $session->setGame($this->game);
-        $session->setScoreboard(new WaitingScoreboard());
-        $session->teleportToWaitingWorld();
-
-        $this->game->broadcastMessage(
-            "{GRAY}" . $session->getUsername() . " {YELLOW}has joined ({AQUA}" .
-            $this->game->getPlayersCount() . "{YELLOW}/{AQUA}" . $this->game->getMap()->getMaxCapacity() . "{YELLOW})!"
-        );
+        $this->onSessionJoin($session);
+        $this->startIfReady();
+    }
 
+    private function startIfReady(): void {
         $map = $this->game->getMap();
         $count = $this->game->getPlayersCount();
 
@@ -39,10 +33,6 @@ public function onJoin(Session $session): void {
         }
     }
 
-    public function onQuit(Session $session): void {
-        $this->game->broadcastMessage("{GRAY}" . $session->getUsername() . " {YELLOW}has quit!");
-    }
-
     public function tick(): void {}
 
 }

src/sergittos/bedwars/game/stage/trait/JoinableTrait.php

@@ -0,0 +1,32 @@
+<?php
+
+
+namespace sergittos\bedwars\game\stage\trait;
+
+
+use sergittos\bedwars\session\scoreboard\WaitingScoreboard;
+use sergittos\bedwars\session\Session;
+use sergittos\bedwars\utils\ConfigGetter;
+use function strtoupper;
+
+trait JoinableTrait {
+
+    public function onJoin(Session $session): void {
+        $session->showBossBar("{YELLOW}Playing {WHITE}BED WARS {YELLOW}on {GREEN}" . strtoupper(ConfigGetter::getIP()));
+        $session->getPlayer()->getEffects()->clear();
+        $session->giveWaitingItems();
+        $session->setGame($this->game);
+        $session->setScoreboard(new WaitingScoreboard());
+        $session->teleportToWaitingWorld();
+
+        $this->game->broadcastMessage(
+            "{GRAY}" . $session->getUsername() . " {YELLOW}has joined ({AQUA}" .
+            $this->game->getPlayersCount() . "{YELLOW}/{AQUA}" . $this->game->getMap()->getMaxCapacity() . "{YELLOW})!"
+        );
+    }
+
+    public function onQuit(Session $session): void {
+        $this->game->broadcastMessage("{GRAY}" . $session->getUsername() . " {YELLOW}has quit!");
+    }
+
+}