mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-08 19:34:09 +01:00
eed041d629
By: md_5 <git@md-5.net>
201 lines
11 KiB
Diff
201 lines
11 KiB
Diff
--- a/net/minecraft/world/level/Explosion.java
|
|
+++ b/net/minecraft/world/level/Explosion.java
|
|
@@ -41,6 +41,16 @@
|
|
import net.minecraft.world.phys.MovingObjectPosition;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.entity.boss.EntityComplexPart;
|
|
+import net.minecraft.world.entity.boss.enderdragon.EntityEnderDragon;
|
|
+import net.minecraft.world.level.block.Blocks;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.EntityExplodeEvent;
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.event.block.BlockExplodeEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class Explosion {
|
|
|
|
private static final ExplosionDamageCalculator EXPLOSION_DAMAGE_CALCULATOR = new ExplosionDamageCalculator();
|
|
@@ -62,6 +72,10 @@
|
|
private final Holder<SoundEffect> explosionSound;
|
|
private final ObjectArrayList<BlockPosition> toBlow;
|
|
private final Map<EntityHuman, Vec3D> hitPlayers;
|
|
+ // CraftBukkit - add field
|
|
+ public boolean wasCanceled = false;
|
|
+ public float yield;
|
|
+ // CraftBukkit end
|
|
|
|
public static DamageSource getDefaultDamageSource(World world, @Nullable Entity entity) {
|
|
return world.damageSources().explosion(entity, getIndirectSourceEntityInternal(entity));
|
|
@@ -87,7 +101,7 @@
|
|
this.hitPlayers = Maps.newHashMap();
|
|
this.level = world;
|
|
this.source = entity;
|
|
- this.radius = f;
|
|
+ this.radius = (float) Math.max(f, 0.0); // CraftBukkit - clamp bad values
|
|
this.x = d0;
|
|
this.y = d1;
|
|
this.z = d2;
|
|
@@ -98,6 +112,7 @@
|
|
this.smallExplosionParticles = particleparam;
|
|
this.largeExplosionParticles = particleparam1;
|
|
this.explosionSound = holder;
|
|
+ this.yield = this.blockInteraction == Explosion.Effect.DESTROY_WITH_DECAY ? 1.0F / this.radius : 1.0F; // CraftBukkit
|
|
}
|
|
|
|
private ExplosionDamageCalculator makeDamageCalculator(@Nullable Entity entity) {
|
|
@@ -148,6 +163,11 @@
|
|
}
|
|
|
|
public void explode() {
|
|
+ // CraftBukkit start
|
|
+ if (this.radius < 0.1F) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.level.gameEvent(this.source, (Holder) GameEvent.EXPLODE, new Vec3D(this.x, this.y, this.z));
|
|
Set<BlockPosition> set = Sets.newHashSet();
|
|
boolean flag = true;
|
|
@@ -230,7 +250,35 @@
|
|
d9 /= d11;
|
|
d10 /= d11;
|
|
if (this.damageCalculator.shouldDamageEntity(this, entity)) {
|
|
- entity.hurt(this.damageSource, this.damageCalculator.getEntityDamageAmount(this, entity));
|
|
+ // CraftBukkit start
|
|
+
|
|
+ // Special case ender dragon only give knockback if no damage is cancelled
|
|
+ // Thinks to note:
|
|
+ // - Setting a velocity to a ComplexEntityPart is ignored (and therefore not needed)
|
|
+ // - Damaging ComplexEntityPart while forward the damage to EntityEnderDragon
|
|
+ // - Damaging EntityEnderDragon does nothing
|
|
+ // - EntityEnderDragon hitbock always covers the other parts and is therefore always present
|
|
+ if (entity instanceof EntityComplexPart) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ entity.lastDamageCancelled = false;
|
|
+
|
|
+ if (entity instanceof EntityEnderDragon) {
|
|
+ for (EntityComplexPart entityComplexPart : ((EntityEnderDragon) entity).subEntities) {
|
|
+ // Calculate damage separately for each EntityComplexPart
|
|
+ if (list.contains(entityComplexPart)) {
|
|
+ entityComplexPart.hurt(this.damageSource, this.damageCalculator.getEntityDamageAmount(this, entity));
|
|
+ }
|
|
+ }
|
|
+ } else {
|
|
+ entity.hurt(this.damageSource, this.damageCalculator.getEntityDamageAmount(this, entity));
|
|
+ }
|
|
+
|
|
+ if (entity.lastDamageCancelled) { // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Skip entity if damage event was cancelled
|
|
+ continue;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
double d12 = (1.0D - d7) * (double) getSeenPercent(vec3d, entity) * (double) this.damageCalculator.getKnockbackMultiplier(entity);
|
|
@@ -249,6 +297,17 @@
|
|
d10 *= d13;
|
|
Vec3D vec3d1 = new Vec3D(d8, d9, d10);
|
|
|
|
+ // CraftBukkit start - Call EntityKnockbackEvent
|
|
+ if (entity instanceof EntityLiving) {
|
|
+ Vec3D result = entity.getDeltaMovement().add(vec3d1);
|
|
+ org.bukkit.event.entity.EntityKnockbackEvent event = CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) entity.getBukkitEntity(), source, org.bukkit.event.entity.EntityKnockbackEvent.KnockbackCause.EXPLOSION, d13, vec3d1, result.x, result.y, result.z);
|
|
+
|
|
+ // SPIGOT-7640: Need to subtract entity movement from the event result,
|
|
+ // since the code below (the setDeltaMovement call as well as the hitPlayers map)
|
|
+ // want the vector to be the relative velocity will the event provides the absolute velocity
|
|
+ vec3d1 = (event.isCancelled()) ? Vec3D.ZERO : new Vec3D(event.getFinalKnockback().getX(), event.getFinalKnockback().getY(), event.getFinalKnockback().getZ()).subtract(entity.getDeltaMovement());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
entity.setDeltaMovement(entity.getDeltaMovement().add(vec3d1));
|
|
if (entity instanceof EntityHuman) {
|
|
EntityHuman entityhuman = (EntityHuman) entity;
|
|
@@ -291,9 +350,65 @@
|
|
|
|
SystemUtils.shuffle(this.toBlow, this.level.random);
|
|
ObjectListIterator objectlistiterator = this.toBlow.iterator();
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.World bworld = this.level.getWorld();
|
|
+ org.bukkit.entity.Entity explode = this.source == null ? null : this.source.getBukkitEntity();
|
|
+ Location location = new Location(bworld, this.x, this.y, this.z);
|
|
+
|
|
+ List<org.bukkit.block.Block> blockList = new ObjectArrayList<>();
|
|
+ for (int i1 = this.toBlow.size() - 1; i1 >= 0; i1--) {
|
|
+ BlockPosition cpos = this.toBlow.get(i1);
|
|
+ org.bukkit.block.Block bblock = bworld.getBlockAt(cpos.getX(), cpos.getY(), cpos.getZ());
|
|
+ if (!bblock.getType().isAir()) {
|
|
+ blockList.add(bblock);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ List<org.bukkit.block.Block> bukkitBlocks;
|
|
+
|
|
+ if (explode != null) {
|
|
+ EntityExplodeEvent event = new EntityExplodeEvent(explode, location, blockList, this.yield);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(event);
|
|
+ this.wasCanceled = event.isCancelled();
|
|
+ bukkitBlocks = event.blockList();
|
|
+ this.yield = event.getYield();
|
|
+ } else {
|
|
+ org.bukkit.block.Block block = location.getBlock();
|
|
+ org.bukkit.block.BlockState blockState = (damageSource.getDirectBlockState() != null) ? damageSource.getDirectBlockState() : block.getState();
|
|
+ BlockExplodeEvent event = new BlockExplodeEvent(block, blockState, blockList, this.yield);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(event);
|
|
+ this.wasCanceled = event.isCancelled();
|
|
+ bukkitBlocks = event.blockList();
|
|
+ this.yield = event.getYield();
|
|
+ }
|
|
+
|
|
+ this.toBlow.clear();
|
|
+
|
|
+ for (org.bukkit.block.Block bblock : bukkitBlocks) {
|
|
+ BlockPosition coords = new BlockPosition(bblock.getX(), bblock.getY(), bblock.getZ());
|
|
+ toBlow.add(coords);
|
|
+ }
|
|
+
|
|
+ if (this.wasCanceled) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+ objectlistiterator = this.toBlow.iterator();
|
|
|
|
while (objectlistiterator.hasNext()) {
|
|
BlockPosition blockposition = (BlockPosition) objectlistiterator.next();
|
|
+ // CraftBukkit start - TNTPrimeEvent
|
|
+ IBlockData iblockdata = this.level.getBlockState(blockposition);
|
|
+ Block block = iblockdata.getBlock();
|
|
+ if (block instanceof net.minecraft.world.level.block.BlockTNT) {
|
|
+ Entity sourceEntity = source == null ? null : source;
|
|
+ BlockPosition sourceBlock = sourceEntity == null ? BlockPosition.containing(this.x, this.y, this.z) : null;
|
|
+ if (!CraftEventFactory.callTNTPrimeEvent(this.level, blockposition, org.bukkit.event.block.TNTPrimeEvent.PrimeCause.EXPLOSION, sourceEntity, sourceBlock)) {
|
|
+ this.level.sendBlockUpdated(blockposition, Blocks.AIR.defaultBlockState(), iblockdata, 3); // Update the block on the client
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
this.level.getBlockState(blockposition).onExplosionHit(this.level, blockposition, this, (itemstack, blockposition1) -> {
|
|
addOrAppendStack(list, itemstack, blockposition1);
|
|
@@ -318,7 +433,11 @@
|
|
BlockPosition blockposition1 = (BlockPosition) objectlistiterator1.next();
|
|
|
|
if (this.random.nextInt(3) == 0 && this.level.getBlockState(blockposition1).isAir() && this.level.getBlockState(blockposition1.below()).isSolidRender(this.level, blockposition1.below())) {
|
|
- this.level.setBlockAndUpdate(blockposition1, BlockFireAbstract.getState(this.level, blockposition1));
|
|
+ // CraftBukkit start - Ignition by explosion
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.level, blockposition1, this).isCancelled()) {
|
|
+ this.level.setBlockAndUpdate(blockposition1, BlockFireAbstract.getState(this.level, blockposition1));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
}
|
|
@@ -326,6 +445,7 @@
|
|
}
|
|
|
|
private static void addOrAppendStack(List<Pair<ItemStack, BlockPosition>> list, ItemStack itemstack, BlockPosition blockposition) {
|
|
+ if (itemstack.isEmpty()) return; // CraftBukkit - SPIGOT-5425
|
|
for (int i = 0; i < list.size(); ++i) {
|
|
Pair<ItemStack, BlockPosition> pair = (Pair) list.get(i);
|
|
ItemStack itemstack1 = (ItemStack) pair.getFirst();
|