summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityLargeFireball.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntityLargeFireball.patch')
-rw-r--r--nms-patches/EntityLargeFireball.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/nms-patches/EntityLargeFireball.patch b/nms-patches/EntityLargeFireball.patch
new file mode 100644
index 00000000..2e14fc4d
--- /dev/null
+++ b/nms-patches/EntityLargeFireball.patch
@@ -0,0 +1,38 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/EntityLargeFireball.java 2014-11-27 08:59:46.697421864 +1100
++++ src/main/java/net/minecraft/server/EntityLargeFireball.java 2014-11-27 08:42:10.152850911 +1100
+@@ -1,5 +1,7 @@
+ package net.minecraft.server;
+
++import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
++
+ public class EntityLargeFireball extends EntityFireball {
+
+ public int yield = 1;
+@@ -21,7 +23,16 @@
+
+ boolean flag = this.world.getGameRules().getBoolean("mobGriefing");
+
+- this.world.createExplosion((Entity) null, this.locX, this.locY, this.locZ, (float) this.yield, flag, flag);
++ // CraftBukkit start - fire ExplosionPrimeEvent
++ ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(this.world.getServer(), this));
++ this.world.getServer().getPluginManager().callEvent(event);
++
++ if (!event.isCancelled()) {
++ // give 'this' instead of (Entity) null so we know what causes the damage
++ this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), flag);
++ }
++ // CraftBukkit end
++
+ this.die();
+ }
+
+@@ -35,7 +46,8 @@
+ public void a(NBTTagCompound nbttagcompound) {
+ super.a(nbttagcompound);
+ if (nbttagcompound.hasKeyOfType("ExplosionPower", 99)) {
+- this.yield = nbttagcompound.getInt("ExplosionPower");
++ // CraftBukkit - set bukkitYield when setting explosionpower
++ bukkitYield = this.yield = nbttagcompound.getInt("ExplosionPower");
+ }
+
+ }