Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-23 19:16:41 +01:00
Code Issues Projects Releases Wiki Activity

v0.94.4.71 redo - not allow joining other arenas from in lobby or arena, spectator is fine

Browse Source
This commit is contained in:
Brian 2012-06-06 20:37:20 -04:00
parent 795edcb9ff
commit 7e48ec7410
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,23 +29,24 @@ public class JoinCommand implements Command
String arg1 = (args.length > 0 ? args[0] : null); String arg1 = (args.length > 0 ? args[0] : null);
// Run some rough sanity checks, and grab the arena to join. // Run some rough sanity checks, and grab the arena to join.
Arena arena = Commands.getArenaToJoinOrSpec(am, p, arg1); Arena toArena = Commands.getArenaToJoinOrSpec(am, p, arg1);
if (arena == null) { Arena fromArena = am.getArenaWithPlayer(p);
if (toArena == null) {
return false; return false;
} }
// Deny joining from other arenas // Deny joining from other arenas
if (am.getArenaWithPlayer(p).inArena(p)) { if (fromArena != null && (fromArena.inArena(p) || fromArena.inLobby(p))) {
Messenger.tellPlayer(p, Msg.JOIN_ALREADY_PLAYING); Messenger.tellPlayer(p, Msg.JOIN_ALREADY_PLAYING);
return false; return false;
} }
// Per-arena sanity checks // Per-arena sanity checks
if (!arena.canJoin(p)) { if (!toArena.canJoin(p)) {
return false; return false;
} }
// Join the arena! // Join the arena!
return arena.playerJoin(p, p.getLocation()); return toArena.playerJoin(p, p.getLocation());
} }
} }