summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-03 17:17:42 +1100
committermd_5 <git@md-5.net>2016-03-03 17:17:42 +1100
commite2c5473e0780cea305203070ac25f4c9d2369077 (patch)
treed115b87aeb60cd4e04e4c91acb4a0e54405e327d /src/main/java/org
parentf5f09ffcbfbe6be42aa2ac3777d835cdeaccfffb (diff)
downloadcraftbukkit-e2c5473e0780cea305203070ac25f4c9d2369077.tar
craftbukkit-e2c5473e0780cea305203070ac25f4c9d2369077.tar.gz
craftbukkit-e2c5473e0780cea305203070ac25f4c9d2369077.tar.lz
craftbukkit-e2c5473e0780cea305203070ac25f4c9d2369077.tar.xz
craftbukkit-e2c5473e0780cea305203070ac25f4c9d2369077.zip
SPIGOT-1679: Shulker bullets are not projectiles.
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7023979a..51dada39 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -926,9 +926,6 @@ public class CraftWorld implements World {
entity.setPositionRotation(x, y, z, yaw, pitch);
Vector direction = location.getDirection().multiply(10);
((EntityFireball) entity).setDirection(direction.getX(), direction.getY(), direction.getZ());
- } else if (ShulkerBullet.class.isAssignableFrom(clazz)) {
- entity = new EntityShulkerBullet(world);
- entity.setPositionRotation(x, y, z, yaw, pitch);
}
} else if (Minecart.class.isAssignableFrom(clazz)) {
if (PoweredMinecart.class.isAssignableFrom(clazz)) {
@@ -1104,6 +1101,9 @@ public class CraftWorld implements World {
entity = new EntityFireworks(world, x, y, z, null);
} else if (AreaEffectCloud.class.isAssignableFrom(clazz)) {
entity = new EntityAreaEffectCloud(world, x, y, z);
+ } else if (ShulkerBullet.class.isAssignableFrom(clazz)) {
+ entity = new EntityShulkerBullet(world);
+ entity.setPositionRotation(x, y, z, yaw, pitch);
}
if (entity != null) {