PaperMC/nms-patches/Explosion.patch

155 lines
7.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/Explosion.java
+++ b/net/minecraft/server/Explosion.java
2016-11-17 02:41:03 +01:00
@@ -10,6 +10,13 @@
2018-12-25 22:00:00 +01:00
import java.util.Set;
2016-11-17 02:41:03 +01:00
import javax.annotation.Nullable;
2015-02-26 23:41:06 +01:00
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.Location;
2015-03-22 20:42:46 +01:00
+import org.bukkit.event.block.BlockExplodeEvent;
+// CraftBukkit end
2015-02-26 23:41:06 +01:00
+
public class Explosion {
2015-02-26 23:41:06 +01:00
private final boolean a;
2018-07-15 02:00:00 +02:00
@@ -24,11 +31,12 @@
private DamageSource j;
2015-02-26 23:41:06 +01:00
private final List<BlockPosition> blocks = Lists.newArrayList();
2018-07-15 02:00:00 +02:00
private final Map<EntityHuman, Vec3D> l = Maps.newHashMap();
+ public boolean wasCanceled = false; // CraftBukkit - add field
2018-07-15 02:00:00 +02:00
public Explosion(World world, @Nullable Entity entity, double d0, double d1, double d2, float f, boolean flag, boolean flag1) {
this.world = world;
this.source = entity;
- this.size = f;
+ this.size = (float) Math.max(f, 0.0); // CraftBukkit - clamp bad values
this.posX = d0;
this.posY = d1;
this.posZ = d2;
2018-07-15 02:00:00 +02:00
@@ -38,6 +46,11 @@
}
public void a() {
+ // CraftBukkit start
+ if (this.size < 0.1F) {
+ return;
+ }
+ // CraftBukkit end
2018-12-25 22:00:00 +01:00
Set<BlockPosition> set = Sets.newHashSet();
boolean flag = true;
2018-08-26 04:00:00 +02:00
@@ -76,7 +89,7 @@
f -= (f2 + 0.3F) * 0.3F;
}
- if (f > 0.0F && (this.source == null || this.source.a(this, this.world, blockposition, iblockdata, f))) {
+ if (f > 0.0F && (this.source == null || this.source.a(this, this.world, blockposition, iblockdata, f)) && blockposition.getY() < 256 && blockposition.getY() >= 0) { // CraftBukkit - don't wrap explosions
2018-12-25 22:00:00 +01:00
set.add(blockposition);
}
2018-08-26 04:00:00 +02:00
@@ -120,7 +133,16 @@
double d12 = (double) this.world.a(vec3d, entity.getBoundingBox());
double d13 = (1.0D - d7) * d12;
2018-07-15 02:00:00 +02:00
- entity.damageEntity(this.b(), (float) ((int) ((d13 * d13 + d13) / 2.0D * 7.0D * (double) f3 + 1.0D)));
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start
2018-07-15 02:00:00 +02:00
+ // entity.damageEntity(this.b(), (float) ((int) ((d13 * d13 + d13) / 2.0D * 7.0D * (double) f3 + 1.0D)));
+ CraftEventFactory.entityDamage = source;
+ entity.forceExplosionKnockback = false;
2018-07-15 02:00:00 +02:00
+ boolean wasDamaged = entity.damageEntity(this.b(), (float) ((int) ((d13 * d13 + d13) / 2.0D * 7.0D * (double) f3 + 1.0D)));
+ CraftEventFactory.entityDamage = null;
+ if (!wasDamaged && !(entity instanceof EntityTNTPrimed || entity instanceof EntityFallingBlock) && !entity.forceExplosionKnockback) {
+ continue;
+ }
+ // CraftBukkit end
2016-11-17 02:41:03 +01:00
double d14 = d13;
2016-02-29 22:32:46 +01:00
if (entity instanceof EntityLiving) {
2018-08-26 04:00:00 +02:00
@@ -156,6 +178,50 @@
BlockPosition blockposition;
if (this.b) {
+ // CraftBukkit start
+ org.bukkit.World bworld = this.world.getWorld();
+ org.bukkit.entity.Entity explode = this.source == null ? null : this.source.getBukkitEntity();
+ Location location = new Location(bworld, this.posX, this.posY, this.posZ);
+
+ List<org.bukkit.block.Block> blockList = Lists.newArrayList();
+ for (int i1 = this.blocks.size() - 1; i1 >= 0; i1--) {
+ BlockPosition cpos = (BlockPosition) this.blocks.get(i1);
+ org.bukkit.block.Block bblock = bworld.getBlockAt(cpos.getX(), cpos.getY(), cpos.getZ());
+ if (bblock.getType() != org.bukkit.Material.AIR) {
+ blockList.add(bblock);
+ }
+ }
+
2015-03-22 20:42:46 +01:00
+ boolean cancelled;
+ List<org.bukkit.block.Block> bukkitBlocks;
+ float yield;
+
+ if (explode != null) {
+ EntityExplodeEvent event = new EntityExplodeEvent(explode, location, blockList, 1.0F / this.size);
2015-03-22 20:42:46 +01:00
+ this.world.getServer().getPluginManager().callEvent(event);
+ cancelled = event.isCancelled();
+ bukkitBlocks = event.blockList();
+ yield = event.getYield();
+ } else {
+ BlockExplodeEvent event = new BlockExplodeEvent(location.getBlock(), blockList, 1.0F / this.size);
2015-03-22 20:42:46 +01:00
+ this.world.getServer().getPluginManager().callEvent(event);
+ cancelled = event.isCancelled();
+ bukkitBlocks = event.blockList();
+ yield = event.getYield();
+ }
+
+ this.blocks.clear();
+
2015-03-22 20:42:46 +01:00
+ for (org.bukkit.block.Block bblock : bukkitBlocks) {
+ BlockPosition coords = new BlockPosition(bblock.getX(), bblock.getY(), bblock.getZ());
+ blocks.add(coords);
+ }
+
2015-03-22 20:42:46 +01:00
+ if (cancelled) {
+ this.wasCanceled = true;
+ return;
+ }
+ // CraftBukkit end
iterator = this.blocks.iterator();
while (iterator.hasNext()) {
2018-08-26 04:00:00 +02:00
@@ -187,7 +253,8 @@
2018-07-15 02:00:00 +02:00
if (!iblockdata.isAir()) {
if (block.a(this)) {
2018-07-15 02:00:00 +02:00
- iblockdata.dropNaturally(this.world, blockposition, 1.0F / this.size, 0);
+ // CraftBukkit - add yield
2018-07-15 02:00:00 +02:00
+ iblockdata.dropNaturally(this.world, blockposition, yield, 0);
}
this.world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 3);
2018-08-26 04:00:00 +02:00
@@ -202,7 +269,11 @@
while (iterator.hasNext()) {
blockposition = (BlockPosition) iterator.next();
2018-07-15 02:00:00 +02:00
if (this.world.getType(blockposition).isAir() && this.world.getType(blockposition.down()).f(this.world, blockposition.down()) && this.c.nextInt(3) == 0) {
- this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ // CraftBukkit start - Ignition by explosion
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this).isCancelled()) {
+ this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ }
+ // CraftBukkit end
}
}
}
2018-08-26 04:00:00 +02:00
@@ -223,7 +294,9 @@
2016-11-17 02:41:03 +01:00
@Nullable
2015-07-30 08:56:52 +02:00
public EntityLiving getSource() {
- return this.source == null ? null : (this.source instanceof EntityTNTPrimed ? ((EntityTNTPrimed) this.source).getSource() : (this.source instanceof EntityLiving ? (EntityLiving) this.source : null));
+ // CraftBukkit start - obtain Fireball shooter for explosion tracking
+ return this.source == null ? null : (this.source instanceof EntityTNTPrimed ? ((EntityTNTPrimed) this.source).getSource() : (this.source instanceof EntityLiving ? (EntityLiving) this.source : (this.source instanceof EntityFireball ? ((EntityFireball) this.source).shooter : null)));
+ // CraftBukkit end
}
public void clearBlocks() {