summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-02-29 18:31:20 -0500
committerEvilSeph <evilseph@gmail.com>2012-02-29 18:31:20 -0500
commit953dad94c2ef059e3b13530a68554d209335d0ef (patch)
treedb0ea9c2c2524947c4c058392bcda9e1e30d5f74
parent8a458ca2734dcccc03693844ab5e152d3ffc8d18 (diff)
downloadbukkit-953dad94c2ef059e3b13530a68554d209335d0ef.tar
bukkit-953dad94c2ef059e3b13530a68554d209335d0ef.tar.gz
bukkit-953dad94c2ef059e3b13530a68554d209335d0ef.tar.lz
bukkit-953dad94c2ef059e3b13530a68554d209335d0ef.tar.xz
bukkit-953dad94c2ef059e3b13530a68554d209335d0ef.zip
Re-added launchProjectile lost due to incorrect conflict resolution.
-rw-r--r--src/main/java/org/bukkit/entity/LivingEntity.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 0ffefa5e..e45fc721 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -115,6 +115,15 @@ public interface LivingEntity extends Entity {
public Arrow shootArrow();
/**
+ * Launches a {@link Projectile} from the entity.
+ *
+ * @param projectile Class of the projectile to launch
+ *
+ * @return The launched projectile.
+ */
+ public <T extends Projectile> T launchProjectile(Class<? extends T> projectile);
+
+ /**
* Returns the amount of air that this entity has remaining, in ticks
*
* @return Amount of air remaining