summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-03 20:59:10 +1100
committermd_5 <git@md-5.net>2016-03-03 20:59:10 +1100
commit23ad72b4c8b46883092f3ef1280093bfa82695c6 (patch)
tree9b9b42febf8873cdbb3b3cf23c6fb58f0b19ef16
parente2c5473e0780cea305203070ac25f4c9d2369077 (diff)
downloadcraftbukkit-23ad72b4c8b46883092f3ef1280093bfa82695c6.tar
craftbukkit-23ad72b4c8b46883092f3ef1280093bfa82695c6.tar.gz
craftbukkit-23ad72b4c8b46883092f3ef1280093bfa82695c6.tar.lz
craftbukkit-23ad72b4c8b46883092f3ef1280093bfa82695c6.tar.xz
craftbukkit-23ad72b4c8b46883092f3ef1280093bfa82695c6.zip
SPIGOT-1683: Arrows are not projectiles
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 0c234c7b..e8aff909 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -9,6 +9,7 @@ import java.util.Set;
import net.minecraft.server.DamageSource;
import net.minecraft.server.EntityArmorStand;
+import net.minecraft.server.EntityArrow;
import net.minecraft.server.EntityDragonFireball;
import net.minecraft.server.EntityEgg;
import net.minecraft.server.EntityEnderPearl;
@@ -337,7 +338,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
((EntityProjectile) launch).a(getHandle(), getHandle().pitch, getHandle().yaw, 0.0F, 1.5F, 1.0F); // ItemEnderPearl
} else if (Arrow.class.isAssignableFrom(projectile)) {
launch = new EntityTippedArrow(world, getHandle());
- ((EntityProjectile) launch).a(getHandle(), getHandle().pitch, getHandle().yaw, 0.0F, 3.0F, 1.0F); // ItemBow
+ ((EntityArrow) launch).a(getHandle(), getHandle().pitch, getHandle().yaw, 0.0F, 3.0F, 1.0F); // ItemBow
} else if (ThrownPotion.class.isAssignableFrom(projectile)) {
launch = new EntityPotion(world, getHandle(), CraftItemStack.asNMSCopy(new ItemStack(Material.POTION, 1)));
((EntityProjectile) launch).a(getHandle(), getHandle().pitch, getHandle().yaw, -20.0F, 0.5F, 1.0F); // ItemSplashPotion