SPIGOT-1727: Fix ShulkerBullet.setTarget

1 files changed, 23 insertions, 14 deletions

diff --git a/nms-patches/EntityShulkerBullet.patch b/nms-patches/EntityShulkerBullet.patch
index c8e96033..d1fcd624 100644
--- a/nms-patches/EntityShulkerBullet.patch
+++ b/nms-patches/EntityShulkerBullet.patch
@@ -1,23 +1,32 @@
 --- a/net/minecraft/server/EntityShulkerBullet.java
 +++ b/net/minecraft/server/EntityShulkerBullet.java
-@@ -10,6 +10,12 @@
- 
-     private EntityLiving shooter;
-     private Entity target;
-+    // CraftBukkit start
-+    public EntityLiving getShooter() { return this.shooter; }
-+    public void setShooter(EntityLiving e) { this.shooter = e; }
-+    public Entity getTarget() { return this.target; }
-+    public void setTarget(Entity e) { this.target = e; }
-+    // CraftBukkit end
-     private EnumDirection c;
-     private int d;
-     private double e;
-@@ -42,6 +48,7 @@
+@@ -42,8 +42,29 @@
          this.target = entity;
          this.c = EnumDirection.UP;
          this.a(enumdirection_enumaxis);
 +        projectileSource = (org.bukkit.entity.LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit
      }
  
++    // CraftBukkit start
++    public EntityLiving getShooter() {
++        return this.shooter;
++    }
++
++    public void setShooter(EntityLiving e) {
++        this.shooter = e;
++    }
++
++    public Entity getTarget() {
++        return this.target;
++    }
++
++    public void setTarget(Entity e) {
++        this.target = e;
++        this.c = EnumDirection.UP;
++        this.a(EnumDirection.EnumAxis.X);
++    }
++    // CraftBukkit end
++
      protected void b(NBTTagCompound nbttagcompound) {
+         BlockPosition blockposition;
+         NBTTagCompound nbttagcompound1;