2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/EntityLargeFireball.java 2015-02-26 22:40:22.603608139 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityLargeFireball.java 2015-02-26 22:40:22.603608139 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,7 @@
|
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class EntityLargeFireball extends EntityFireball {
|
|
|
|
|
|
|
|
|
|
public int yield = 1;
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -21,7 +23,15 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
|
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();
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -35,7 +45,8 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
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");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
