From 795edcb9ff161cbb591e16f1c21fef049ae6ea95 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 6 Jun 2012 20:32:01 -0400 Subject: [PATCH] v0.94.4.71 - allow joining arenas from spectator areas --- resources/plugin.yml | 2 +- src/com/garbagemule/MobArena/commands/user/JoinCommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/plugin.yml b/resources/plugin.yml index 0949d28..cffa65e 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,7 +1,7 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.94.4.70 +version: 0.94.4.71 softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault] commands: ma: diff --git a/src/com/garbagemule/MobArena/commands/user/JoinCommand.java b/src/com/garbagemule/MobArena/commands/user/JoinCommand.java index 453d8b9..1ecdc8b 100644 --- a/src/com/garbagemule/MobArena/commands/user/JoinCommand.java +++ b/src/com/garbagemule/MobArena/commands/user/JoinCommand.java @@ -35,7 +35,7 @@ public class JoinCommand implements Command } // Deny joining from other arenas - if (am.getArenaWithPlayer(p) != null) { + if (am.getArenaWithPlayer(p).inArena(p)) { Messenger.tellPlayer(p, Msg.JOIN_ALREADY_PLAYING); return false; }