Skip to content

Commit 4f702f7

Browse files
committed
Fix games not starting properly
1 parent c914ceb commit 4f702f7

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
use function count;
2121
use function round;
2222
use function shuffle;
23-
use function var_dump;
2423

2524
class PlayingStage extends Stage {
2625

@@ -30,6 +29,10 @@ public function getNextEvent(): Event {
3029
return $this->next_event;
3130
}
3231

32+
public function hasStarted(): bool {
33+
return isset($this->next_event);
34+
}
35+
3336
private function startNextEvent(?Event $event = null): void {
3437
$this->next_event = $event ?? $this->next_event->getNextEvent();
3538
$this->next_event->start($this->game);

src/sergittos/bedwars/listener/GameListener.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
use sergittos\bedwars\BedWars;
5151
use sergittos\bedwars\game\entity\shop\Villager;
5252
use sergittos\bedwars\game\Game;
53+
use sergittos\bedwars\game\stage\PlayingStage;
5354
use sergittos\bedwars\game\team\Team;
5455
use sergittos\bedwars\session\Session;
5556
use sergittos\bedwars\session\SessionFactory;
@@ -247,7 +248,8 @@ public function onEntityTeleport(EntityTeleportEvent $event): void {
247248
return;
248249
}
249250

250-
if($event->getFrom()->getWorld() !== $event->getTo()->getWorld()) {
251+
$stage = $session->getGame()->getStage();
252+
if($stage instanceof PlayingStage and $stage->hasStarted() and $event->getFrom()->getWorld() !== $event->getTo()->getWorld()) {
251253
$session->getGame()->removePlayer($session, false);
252254
}
253255
}

0 commit comments

Comments
 (0)