Paper/nms-patches/EntityCreeper.patch

83 lines
3.0 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityCreeper.java
+++ b/net/minecraft/server/EntityCreeper.java
2016-11-17 02:41:03 +01:00
@@ -3,6 +3,10 @@
import java.util.Collection;
import java.util.Iterator;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class EntityCreeper extends EntityMonster {
2016-11-17 02:41:03 +01:00
@@ -125,7 +129,7 @@
}
public void die(DamageSource damagesource) {
- super.die(damagesource);
+ // super.die(damagesource); // CraftBukkit - Moved to end
2016-02-29 22:32:46 +01:00
if (this.world.getGameRules().getBoolean("doMobLoot")) {
if (damagesource.getEntity() instanceof EntitySkeleton) {
int i = Item.getId(Items.RECORD_13);
2016-11-17 02:41:03 +01:00
@@ -138,6 +142,7 @@
2016-03-07 09:51:42 +01:00
this.a(new ItemStack(Items.SKULL, 1, 4), 0.0F);
2016-02-29 22:32:46 +01:00
}
}
+ super.die(damagesource); // CraftBukkit - Moved from above
2016-03-07 09:51:42 +01:00
}
2016-11-17 02:41:03 +01:00
@@ -164,9 +169,19 @@
public void onLightningStrike(EntityLightning entitylightning) {
super.onLightningStrike(entitylightning);
2016-05-31 12:53:37 +02:00
- this.datawatcher.set(EntityCreeper.b, Boolean.valueOf(true));
+ // CraftBukkit start
+ if (CraftEventFactory.callCreeperPowerEvent(this, entitylightning, org.bukkit.event.entity.CreeperPowerEvent.PowerCause.LIGHTNING).isCancelled()) {
+ return;
+ }
+
+ this.setPowered(true);
}
2016-05-31 12:53:37 +02:00
+ public void setPowered(boolean powered) {
+ this.datawatcher.set(EntityCreeper.b, powered);
+ }
+ // CraftBukkit end
+
2016-11-17 02:41:03 +01:00
protected boolean a(EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.b(enumhand);
@@ -188,10 +203,18 @@
boolean flag = this.world.getGameRules().getBoolean("mobGriefing");
float f = this.isPowered() ? 2.0F : 1.0F;
2015-02-26 23:41:06 +01:00
2016-11-17 02:41:03 +01:00
- this.aU = true;
- this.world.explode(this, this.locX, this.locY, this.locZ, (float) this.explosionRadius * f, flag);
- this.die();
2017-06-08 10:00:00 +02:00
- this.ds();
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), this.explosionRadius * f, false);
+ this.world.getServer().getPluginManager().callEvent(event);
+ if (!event.isCancelled()) {
2016-11-17 02:41:03 +01:00
+ this.aU = true;
+ this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), flag);
+ this.die();
2017-06-08 10:00:00 +02:00
+ this.ds();
+ } else {
+ fuseTicks = 0;
+ }
+ // CraftBukkit end
}
}
@@ -202,6 +225,7 @@
if (!collection.isEmpty()) {
EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX, this.locY, this.locZ);
+ entityareaeffectcloud.setSource(this); // CraftBukkit
entityareaeffectcloud.setRadius(2.5F);
entityareaeffectcloud.setRadiusOnUse(-0.5F);
entityareaeffectcloud.setWaitTime(10);