Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2025-02-14 19:42:09 +01:00
Code Issues Projects Releases Wiki Activity

Start the join-interrupt-timer from the spectator area.

Browse Source 
Following the changes in 266104d0a1, this commit gathers the leave-then-join logic and handles it in one fell swoop when joining from the spectator area. This means that the timer will start, and when it runs out, the player leaves the current arena (if any), and then joins.

There should be no issues with overlapping timers or anything like that, since the lookup happens when the time is up, not before the timer is started.
This commit is contained in:
Andreas Troelsen 2018-08-28 21:30:45 +02:00
parent d17b588647
commit c546641c7b
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/garbagemule/MobArena/commands/user/JoinCommand.java
View File

@ -30,18 +30,6 @@ public class JoinCommand implements Command
Player p = Commands.unwrap(sender);
String arg1 = (args.length > 0 ? args[0] : null);
// If the player is currently in an arena, leave it first
Arena current = am.getArenaWithPlayer(p);
if (current != null) {
if (current.inArena(p) || current.inLobby(p)) {
current.getMessenger().tell(p, Msg.JOIN_ALREADY_PLAYING);
return true;
}
if (!current.playerLeave(p)) {
return true;
}
}
// Run some rough sanity checks, and grab the arena to join.
Arena toArena = Commands.getArenaToJoinOrSpec(am, p, arg1);
if (toArena == null || !canJoin(p, toArena)) {
@ -51,14 +39,14 @@ public class JoinCommand implements Command
// Join the arena!
int seconds = toArena.getSettings().getInt("join-interrupt-timer", 0);
if (seconds > 0) {
boolean started = am.getJoinInterruptTimer().start(p, toArena, seconds, () -> tryJoin(p, toArena));
boolean started = am.getJoinInterruptTimer().start(p, toArena, seconds, () -> tryJoin(am, p, toArena));
if (started) {
toArena.getMessenger().tell(p, Msg.JOIN_AFTER_DELAY, String.valueOf(seconds));
} else {
toArena.getMessenger().tell(p, Msg.JOIN_ALREADY_PLAYING);
}
} else {
tryJoin(p, toArena);
tryJoin(am, p, toArena);
}
return true;
}
@ -73,7 +61,18 @@ public class JoinCommand implements Command
return arena.canJoin(player);
}
private void tryJoin(Player player, Arena arena) {
private void tryJoin(ArenaMaster am, Player player, Arena arena) {
// If the player is currently in an arena, leave it first
Arena current = am.getArenaWithPlayer(player);
if (current != null) {
if (current.inArena(player) || current.inLobby(player)) {
current.getMessenger().tell(player, Msg.JOIN_ALREADY_PLAYING);
return;
}
if (!current.playerLeave(player)) {
return;
}
}
if (canJoin(player, arena)) {
arena.playerJoin(player, player.getLocation());
}