|
@@ -120,11 +120,10 @@ public class PlayerListener implements Listener {
|
|
|
// old game handling:
|
|
|
if (gameFrom != null) registerPlayerArenaLeaveEvent(player, gameFrom);
|
|
|
|
|
|
- // teleport after a delay between the arena leave and the next area join
|
|
|
+ // new game handling (after a delay):
|
|
|
if (gameTo == null) return;
|
|
|
new BukkitRunnable() {
|
|
|
public void run() {
|
|
|
- // new game handling:
|
|
|
PlayerArenaJoinEvent joinEvent = registerPlayerArenaJoinEvent(player, gameTo);
|
|
|
if (joinEvent.isCancelled()) gameTo.teleportToFallbackSpawn(player);
|
|
|
}
|
|
@@ -146,11 +145,10 @@ public class PlayerListener implements Listener {
|
|
|
// old game handling:
|
|
|
if (gameFrom != null) registerPlayerArenaLeaveEvent(player, gameFrom);
|
|
|
|
|
|
- // new game handling:
|
|
|
+ // new game handling (after a delay):
|
|
|
if (gameTo == null) return;
|
|
|
new BukkitRunnable() {
|
|
|
public void run() {
|
|
|
- // new game handling:
|
|
|
PlayerArenaJoinEvent joinEvent = registerPlayerArenaJoinEvent(player, gameTo);
|
|
|
if (joinEvent.isCancelled()) Game.knockbackEffect(player, from, to);
|
|
|
}
|