Clean up some world events dealing with entities.

DenizenScript · Sep 15, 2013 · 12c804c · 12c804c
1 parent a2c1620
commit 12c804c
Show file tree

Hide file tree

Showing 2 changed files with 270 additions and 245 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -32,6 +32,7 @@
 import org.bukkit.entity.Ocelot;
 import org.bukkit.entity.PigZombie;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Sheep;
 import org.bukkit.entity.Skeleton;
 import org.bukkit.entity.Slime;
@@ -334,6 +335,17 @@ public NPC getNPC() {
 
         return CitizensAPI.getNPCRegistry().getNPC(entity);
     }
+
+    /**
+     * Get the dNPC corresponding to this entity
+     *
+     * @return  The dNPC
+     */
+
+    public dNPC getDenizenNPC() {
+
+        return new dNPC(getNPC());
+    }
 
     /**
      * Check whether this entity is an NPC
@@ -365,6 +377,37 @@ public Player getPlayer() {
     public boolean isPlayer() {
         return entity instanceof Player;
     }
+
+    /**
+     * Get this entity as a Projectile
+     *
+     * @return  true or false
+     */
+
+    public Projectile getProjectile() {
+
+        return (Projectile) entity;
+    }
+
+    /**
+     * Check whether this entity is a Projectile
+     *
+     * @return  true or false
+     */
+
+    public boolean isProjectile() {
+        return entity instanceof Projectile;
+    }
+
+    /**
+     * Get this entity's shooter
+     *
+     * @return  true or false
+     */
+
+    public dEntity getShooter() {
+        return new dEntity(getProjectile().getShooter());
+    }
 
     /**
      * Whether this entity identifies as a generic