Fix mobarenas.

DenizenScript · Jan 14, 2016 · e951eed · e951eed
1 parent 8171ff4
commit e951eed
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 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
@@ -4,6 +4,7 @@
 import com.garbagemule.MobArena.framework.Arena;
 import net.aufdemrand.denizen.objects.dPlayer;
 import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.Fetchable;
 import net.aufdemrand.denizencore.objects.dList;
 import net.aufdemrand.denizencore.objects.dObject;
 import net.aufdemrand.denizencore.tags.Attribute;
@@ -24,7 +25,14 @@ public static MobArenaArena valueOf(String name) {
         return valueOf(name, null);
     }
 
+    @Fetchable("mobarena")
     public static MobArenaArena valueOf(String name, TagContext context) {
+        if (name == null) {
+            return null;
+        }
+
+        ////////
+        // Match Arena name
         name = name.replace("mobarena@", "");
         Arena arena = plugin.getArenaMaster().getArenaWithName(name);
         if (arena == null) {
@@ -34,7 +42,10 @@ public static MobArenaArena valueOf(String name, TagContext context) {
     }
 
     public static boolean matches(String name) {
-        return valueOf(name) != null;
+        if (valueOf(name) == null) {
+            return false;
+        }
+        return true;
     }
 
     public MobArenaArena(Arena arena) {

diff --git a/src/main/java/net/gnomeffinway/depenizen/support/plugins/MobArenaSupport.java b/src/main/java/net/gnomeffinway/depenizen/support/plugins/MobArenaSupport.java
@@ -11,17 +11,19 @@
 import net.gnomeffinway.depenizen.extensions.mobarena.MobArenaPlayerExtension;
 import net.gnomeffinway.depenizen.objects.mobarena.MobArenaArena;
 import net.gnomeffinway.depenizen.support.Support;
-import org.bukkit.Bukkit;
 
 public class MobArenaSupport extends Support {
 
+    MobArena plugin;
+
     public MobArenaSupport() {
         registerObjects(MobArenaArena.class);
         registerAdditionalTags("mobarena");
         registerEvents(MobArenaStartsScriptEvent.class);
         registerEvents(MobArenaEndsScriptEvent.class);
         registerEvents(MobArenaWaveChangesScriptEvent.class);
         registerProperty(MobArenaPlayerExtension.class, dPlayer.class);
+        plugin = Support.getPlugin(MobArenaSupport.class);
     }
 
     @Override
@@ -42,9 +44,16 @@ public String additionalTags(Attribute attribute) {
 
             attribute = attribute.fulfill(1);
 
+            // <--[tag]
+            // @attribute <mobarena.list_arenas>
+            // @returns dList(MobArena)
+            // @description
+            // Returns a list of all MobArenas.
+            // @plugin Depenizen, MobArena
+            // -->
             if (attribute.startsWith("list_arenas")) {
                 dList arenas = new dList();
-                for (Arena a : ((MobArena) Support.getPlugin(MobArenaSupport.class)).getArenaMaster().getArenas()) {
+                for (Arena a : plugin.getArenaMaster().getArenas()) {
                     arenas.add(new MobArenaArena(a).identify());
                 }
                 return arenas.getAttribute(attribute.fulfill(1));