2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderCrystal.java 2014-11-28 17:43:43.081707435 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityEnderCrystal.java 2014-11-28 17:38:19.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,10 @@
|
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
|
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent;
|
|
|
|
|
+// CraftBukkit end
|
|
|
|
|
+
|
|
|
|
|
public class EntityEnderCrystal extends Entity {
|
|
|
|
|
|
|
|
|
|
public int a;
|
|
|
|
|
@@ -32,7 +37,11 @@
|
|
|
|
|
int k = MathHelper.floor(this.locZ);
|
|
|
|
|
|
|
|
|
|
if (this.world.worldProvider instanceof WorldProviderTheEnd && this.world.getType(new BlockPosition(i, j, k)).getBlock() != Blocks.FIRE) {
|
|
|
|
|
- this.world.setTypeUpdate(new BlockPosition(i, j, k), Blocks.FIRE.getBlockData());
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (!CraftEventFactory.callBlockIgniteEvent(this.world, i, j, k, this).isCancelled()) {
|
|
|
|
|
+ this.world.setTypeUpdate(new BlockPosition(i, j, k), Blocks.FIRE.getBlockData());
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
@@ -54,7 +63,15 @@
|
|
|
|
|
if (this.b <= 0) {
|
|
|
|
|
this.die();
|
|
|
|
|
if (!this.world.isStatic) {
|
|
|
|
|
- this.world.explode((Entity) null, this.locX, this.locY, this.locZ, 6.0F, true);
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, false);
|
|
|
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
|
+ this.dead = false;
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), true);
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
