PaperMC/nms-patches/EntityShulkerBullet.patch

50 lines
1.8 KiB
Diff
Raw Normal View History

2016-02-29 22:32:46 +01:00
--- a/net/minecraft/server/EntityShulkerBullet.java
+++ b/net/minecraft/server/EntityShulkerBullet.java
2018-12-25 22:00:00 +01:00
@@ -41,8 +41,29 @@
2016-02-29 22:32:46 +01:00
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
+
2018-07-15 02:00:00 +02:00
public SoundCategory bV() {
return SoundCategory.HOSTILE;
}
2018-12-25 22:00:00 +01:00
@@ -286,6 +307,7 @@
}
protected void a(MovingObjectPosition movingobjectposition) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Craftbukkit - Call event
if (movingobjectposition.entity == null) {
2018-07-15 02:00:00 +02:00
((WorldServer) this.world).a(Particles.u, this.locX, this.locY, this.locZ, 2, 0.2D, 0.2D, 0.2D, 0.0D);
this.a(SoundEffects.ENTITY_SHULKER_BULLET_HIT, 1.0F, 1.0F);
2018-12-25 22:00:00 +01:00
@@ -295,7 +317,7 @@
if (flag) {
this.a(this.shooter, movingobjectposition.entity);
if (movingobjectposition.entity instanceof EntityLiving) {
- ((EntityLiving) movingobjectposition.entity).addEffect(new MobEffect(MobEffects.LEVITATION, 200));
+ ((EntityLiving) movingobjectposition.entity).addEffect(new MobEffect(MobEffects.LEVITATION, 200), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
}
}
}