2015-05-25 18:37:24 +08:00
|
|
|
--- a/net/minecraft/server/EntityWitherSkull.java
|
|
|
|
|
+++ b/net/minecraft/server/EntityWitherSkull.java
|
2014-11-26 05:32:16 +08:00
|
|
|
@@ -1,5 +1,7 @@
|
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class EntityWitherSkull extends EntityFireball {
|
|
|
|
|
|
2016-03-01 05:32:46 +08:00
|
|
|
private static final DataWatcherObject<Boolean> e = DataWatcher.a(EntityWitherSkull.class, DataWatcherRegistry.h);
|
|
|
|
|
@@ -37,9 +39,9 @@
|
2015-02-27 06:41:06 +08:00
|
|
|
if (!this.world.isClientSide) {
|
2015-01-25 07:20:00 +08:00
|
|
|
if (movingobjectposition.entity != null) {
|
2014-11-26 05:32:16 +08:00
|
|
|
if (this.shooter != null) {
|
2015-01-25 07:20:00 +08:00
|
|
|
- if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
|
|
|
|
|
+ if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
|
2014-11-26 05:32:16 +08:00
|
|
|
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);
|
|
|
|
|
}
|
2016-03-01 05:32:46 +08:00
|
|
|
@@ -63,7 +65,15 @@
|
2014-11-26 05:32:16 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- 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();
|
|
|
|
|
}
|
|
|
|
|
|
