Paper/nms-patches/EntityWitherSkull.patch

50 lines
2.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityWitherSkull.java
+++ b/net/minecraft/server/EntityWitherSkull.java
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
+
public class EntityWitherSkull extends EntityFireball {
2019-04-23 04:00:00 +02:00
private static final DataWatcherObject<Boolean> f = DataWatcher.a(EntityWitherSkull.class, DataWatcherRegistry.i);
@@ -34,11 +36,11 @@
Entity entity = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
if (this.shooter != null) {
2019-04-23 04:00:00 +02:00
- if (entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
+ if (entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
if (entity.isAlive()) {
this.a(this.shooter, entity);
2016-06-09 03:43:49 +02:00
} else {
- this.shooter.heal(5.0F);
+ this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
}
2016-06-09 03:43:49 +02:00
}
} else {
2019-04-23 04:00:00 +02:00
@@ -55,14 +57,22 @@
}
if (b0 > 0) {
2019-04-23 04:00:00 +02:00
- ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.WITHER, 20 * b0, 1));
+ ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.WITHER, 20 * b0, 1), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
}
}
}
2019-04-23 04:00:00 +02:00
Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean("mobGriefing") ? Explosion.Effect.DESTROY : Explosion.Effect.NONE;
- this.world.createExplosion(this, this.locX, this.locY, this.locZ, 1.0F, false, explosion_effect);
+ // CraftBukkit start
2019-04-23 04:00:00 +02:00
+ // this.world.createExplosion(this, this.locX, this.locY, this.locZ, 1.0F, false, explosion_effect);
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 1.0F, false);
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (!event.isCancelled()) {
2019-04-23 04:00:00 +02:00
+ this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), explosion_effect);
+ }
+ // CraftBukkit end
this.die();
}