Paper/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
2019-04-23 04:00:00 +02:00
@@ -40,8 +40,29 @@
2016-02-29 22:32:46 +01:00
this.target = entity;
2019-04-23 04:00:00 +02:00
this.dir = EnumDirection.UP;
2016-02-29 22:32:46 +01:00
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;
2019-04-23 04:00:00 +02:00
+ this.dir = EnumDirection.UP;
+ this.a(EnumDirection.EnumAxis.X);
+ }
+ // CraftBukkit end
+
2019-04-23 04:00:00 +02:00
@Override
public SoundCategory getSoundCategory() {
2018-07-15 02:00:00 +02:00
return SoundCategory.HOSTILE;
2019-04-23 04:00:00 +02:00
@@ -294,6 +315,7 @@
}
protected void a(MovingObjectPosition movingobjectposition) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // Craftbukkit - Call event
2019-04-23 04:00:00 +02:00
if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY) {
Entity entity = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
boolean flag = entity.damageEntity(DamageSource.a(this, this.shooter).c(), 4.0F);
@@ -301,7 +323,7 @@
if (flag) {
2019-04-23 04:00:00 +02:00
this.a(this.shooter, entity);
if (entity instanceof EntityLiving) {
- ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.LEVITATION, 200));
+ ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.LEVITATION, 200), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
}
}
2019-04-23 04:00:00 +02:00
} else {