Further MobArena Fixes.

DenizenScript · Jan 14, 2016 · 1579bf6 · 1579bf6
1 parent e951eed
commit 1579bf6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/net/gnomeffinway/depenizen/objects/mobarena/MobArenaArena.java b/src/main/java/net/gnomeffinway/depenizen/objects/mobarena/MobArenaArena.java
@@ -42,10 +42,7 @@ public static MobArenaArena valueOf(String name, TagContext context) {
     }
 
     public static boolean matches(String name) {
-        if (valueOf(name) == null) {
-            return false;
-        }
-        return true;
+        return valueOf(name) != null;
     }
 
     public MobArenaArena(Arena arena) {
@@ -89,7 +86,7 @@ public String getObjectType() {
 
     @Override
     public String identify() {
-        return "mobarena@" + arena.arenaName();
+        return "mobarena@" + arena.configName();
     }
 
     @Override

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/plugins/MobArenaSupport.java b/src/main/java/net/gnomeffinway/depenizen/support/plugins/MobArenaSupport.java
@@ -54,6 +54,9 @@ public String additionalTags(Attribute attribute) {
             if (attribute.startsWith("list_arenas")) {
                 dList arenas = new dList();
                 for (Arena a : plugin.getArenaMaster().getArenas()) {
+                    if (plugin.getArenaMaster().getArenaWithName(a.arenaName()) == null) {
+                        continue;
+                    }
                     arenas.add(new MobArenaArena(a).identify());
                 }
                 return arenas.getAttribute(attribute.fulfill(1));