40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
|
--- 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 {
|
||
|
|
|
||
|
|
public EntityWitherSkull(World world) {
|
||
|
|
@@ -35,9 +37,9 @@
|
||
|
|
if (!this.world.isClientSide) {
|
||
|
|
if (movingobjectposition.entity != null) {
|
||
|
|
if (this.shooter != null) {
|
||
|
|
- if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
|
||
|
|
+ if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
|
||
|
|
if (!movingobjectposition.entity.isAlive()) {
|
||
|
|
- this.shooter.heal(5.0F);
|
||
|
|
+ this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
|
||
|
|
} else {
|
||
|
|
this.a(this.shooter, movingobjectposition.entity);
|
||
|
|
}
|
||
|
|
@@ -61,7 +63,15 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
- this.world.createExplosion(this, this.locX, this.locY, this.locZ, 1.0F, false, this.world.getGameRules().getBoolean("mobGriefing"));
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ // this.world.createExplosion(this, this.locX, this.locY, this.locZ, 1.0F, false, this.world.getGameRules().getBoolean("mobGriefing"));
|
||
|
|
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 1.0F, false);
|
||
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
||
|
|
+
|
||
|
|
+ if (!event.isCancelled()) {
|
||
|
|
+ this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), this.world.getGameRules().getBoolean("mobGriefing"));
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
this.die();
|
||
|
|
}
|
||
|
|
|