File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change 2020use function count ;
2121use function round ;
2222use function shuffle ;
23- use function var_dump ;
2423
2524class 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 );
Original file line number Diff line number Diff line change 5050use sergittos \bedwars \BedWars ;
5151use sergittos \bedwars \game \entity \shop \Villager ;
5252use sergittos \bedwars \game \Game ;
53+ use sergittos \bedwars \game \stage \PlayingStage ;
5354use sergittos \bedwars \game \team \Team ;
5455use sergittos \bedwars \session \Session ;
5556use 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 }
You can’t perform that action at this time.
0 commit comments