From 3fdbb97f6d4831a9786b2335c08eaa9e62568ce3 Mon Sep 17 00:00:00 2001
From: MorphanOne <morphanone@gmail.com>
Date: Thu, 12 Dec 2013 16:55:03 -0500
Subject: [PATCH] Add matchesType() and asType() to Elements

---
 src/main/java/net/aufdemrand/denizen/objects/Element.java | 8 ++++++++
 .../net/aufdemrand/denizen/objects/ObjectFetcher.java     | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java
index 93a5c42300..d83512187c 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/Element.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/Element.java
@@ -151,6 +151,14 @@ public String asString() {
         return element;
     }
 
+    public boolean matchesType(Class<? extends dObject> dClass) {
+        return ObjectFetcher.checkMatch(dClass, element);
+    }
+
+    public <T extends dObject> T asType(Class<T> dClass) {
+        return ObjectFetcher.getObjectFrom(dClass, element);
+    }
+
     private String prefix;
 
     @Override
diff --git a/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java b/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java
index e8d043ad77..e61255801c 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java
@@ -96,9 +96,9 @@ public static boolean checkMatch(Class<? extends dObject> dClass, String value)
 
     }
 
-    public static dObject getObjectFrom(Class<? extends dObject> dClass, String value) {
+    public static <T extends dObject> T getObjectFrom(Class<T> dClass, String value) {
         try {
-            return (dObject) valueof.get(dClass).invoke(null, value);
+            return (T) valueof.get(dClass).invoke(null, value);
         } catch (Exception e) {
             dB.echoError(e);
         }