Commits

md_5 authored 3e3516e3b29
Treat ShulkerBullet as Projectile
No tags

src/main/java/org/bukkit/craftbukkit/entity/CraftShulkerBullet.java

Modified
1 1 package org.bukkit.craftbukkit.entity;
2 2
3 -import net.minecraft.server.Entity;
4 3 import net.minecraft.server.EntityShulkerBullet;
5 4 import org.bukkit.craftbukkit.CraftServer;
6 5 import org.bukkit.entity.EntityType;
7 6 import org.bukkit.entity.LivingEntity;
8 7 import org.bukkit.entity.ShulkerBullet;
9 8 import org.bukkit.projectiles.ProjectileSource;
10 9
11 -public class CraftShulkerBullet extends CraftEntity implements ShulkerBullet {
10 +public class CraftShulkerBullet extends AbstractProjectile implements ShulkerBullet {
12 11
13 12 public CraftShulkerBullet(CraftServer server, EntityShulkerBullet entity) {
14 13 super(server, entity);
15 14 }
16 15
17 16 @Override
18 17 public ProjectileSource getShooter() {
19 18 return getHandle().projectileSource;
20 19 }
21 20
41 40
42 41 @Override
43 42 public EntityType getType() {
44 43 return EntityType.SHULKER_BULLET;
45 44 }
46 45
47 46 @Override
48 47 public EntityShulkerBullet getHandle() {
49 48 return (EntityShulkerBullet) entity;
50 49 }
50 +
51 + @Deprecated
52 + public LivingEntity _INVALID_getShooter() {
53 + if (getHandle().getShooter() == null) {
54 + return null;
55 + }
56 + return (LivingEntity) getHandle().getShooter().getBukkitEntity();
57 + }
58 +
59 + @Deprecated
60 + public void _INVALID_setShooter(LivingEntity shooter) {
61 + getHandle().setShooter(((CraftLivingEntity) shooter).getHandle());
62 + }
51 63 }

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut