Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 10:57:47 +01:00
Code Issues Projects Releases Wiki Activity

Treat ShulkerBullet as Projectile

Browse Source
This commit is contained in:
md_5 2016-03-03 17:30:03 +11:00
parent 9056e66554
commit 3e3516e3b2
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -926,6 +926,9 @@ public class CraftWorld implements World {
entity.setPositionRotation(x, y, z, yaw, pitch); entity.setPositionRotation(x, y, z, yaw, pitch);
Vector direction = location.getDirection().multiply(10); Vector direction = location.getDirection().multiply(10);
((EntityFireball) entity).setDirection(direction.getX(), direction.getY(), direction.getZ()); ((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)) { } else if (Minecart.class.isAssignableFrom(clazz)) {
if (PoweredMinecart.class.isAssignableFrom(clazz)) { if (PoweredMinecart.class.isAssignableFrom(clazz)) {
@ -1101,9 +1104,6 @@ public class CraftWorld implements World {
entity = new EntityFireworks(world, x, y, z, null); entity = new EntityFireworks(world, x, y, z, null);
} else if (AreaEffectCloud.class.isAssignableFrom(clazz)) { } else if (AreaEffectCloud.class.isAssignableFrom(clazz)) {
entity = new EntityAreaEffectCloud(world, x, y, z); 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) { if (entity != null) {

16
src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java
View File

@ -1,6 +1,5 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.Entity;
import net.minecraft.server.EntityShulkerBullet; import net.minecraft.server.EntityShulkerBullet;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -8,7 +7,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.ShulkerBullet; import org.bukkit.entity.ShulkerBullet;
import org.bukkit.projectiles.ProjectileSource; import org.bukkit.projectiles.ProjectileSource;
public class CraftShulkerBullet extends CraftEntity implements ShulkerBullet { public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBullet {
public CraftShulkerBullet(CraftServer server, EntityShulkerBullet entity) { public CraftShulkerBullet(CraftServer server, EntityShulkerBullet entity) {
super(server, entity); super(server, entity);
@ -48,4 +47,17 @@ public class CraftShulkerBullet extends CraftEntity implements ShulkerBullet {
public EntityShulkerBullet getHandle() { public EntityShulkerBullet getHandle() {
return (EntityShulkerBullet) entity; return (EntityShulkerBullet) entity;
} }
@Deprecated
public LivingEntity _INVALID_getShooter() {
if (getHandle().getShooter() == null) {
return null;
}
return (LivingEntity) getHandle().getShooter().getBukkitEntity();
}
@Deprecated
public void _INVALID_setShooter(LivingEntity shooter) {
getHandle().setShooter(((CraftLivingEntity) shooter).getHandle());
}
} }