OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-22 08:15:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

#1142: Calculate explosion damage separately for each affected EntityComplexPart

Browse source 
Currently the Ender Dragon takes roughly 3x the explosion damage when compared to vanilla 1.19.3. This is caused by a single damage value being calculated for the EntityEnderDragon and then being uniformly applied to every EntityComplexPart belonging to that dragon.

This is resolved by restoring the vanilla behavior of calculating explosion damage separately for each EntityComplexPart.

By: Jacob Martin <jjm_223@hotmail.com>
This commit is contained in:
CraftBukkit/Spigot 2023-02-27 20:34:19 +11:00
parent 229f3bb810
commit ed2f6b4efc
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
paper-server/nms-patches/net/minecraft/world/level/Explosion.patch
View file

@ -45,7 +45,7 @@
this.level.gameEvent(this.source, GameEvent.EXPLODE, new Vec3D(this.x, this.y, this.z)); this.level.gameEvent(this.source, GameEvent.EXPLODE, new Vec3D(this.x, this.y, this.z));
Set<BlockPosition> set = Sets.newHashSet(); Set<BlockPosition> set = Sets.newHashSet();
boolean flag = true; boolean flag = true;
@@ -211,7 +226,36 @@ @@ -211,7 +226,39 @@
double d12 = (double) getSeenPercent(vec3d, entity); double d12 = (double) getSeenPercent(vec3d, entity);
double d13 = (1.0D - d7) * d12; double d13 = (1.0D - d7) * d12;
@ -67,8 +67,11 @@
+ +
+ if (entity instanceof EntityEnderDragon) { + if (entity instanceof EntityEnderDragon) {
+ for (EntityComplexPart entityComplexPart : ((EntityEnderDragon) entity).subEntities) { + for (EntityComplexPart entityComplexPart : ((EntityEnderDragon) entity).subEntities) {
+ if (list.contains(entityComplexPart)) { + // Calculate damage separately for each EntityComplexPart
+ entityComplexPart.hurt(this.getDamageSource(), (float) ((int) ((d13 * d13 + d13) / 2.0D * 7.0D * (double) f2 + 1.0D))); + double d7part;
+ if (list.contains(entityComplexPart) && (d7part = Math.sqrt(entityComplexPart.distanceToSqr(vec3d)) / f2) <= 1.0D) {
+ double d13part = (1.0D - d7part) * getSeenPercent(vec3d, entityComplexPart);
+ entityComplexPart.hurt(this.getDamageSource(), (float) ((int) ((d13part * d13part + d13part) / 2.0D * 7.0D * (double) f2 + 1.0D)));
+ } + }
+ } + }
+ } else { + } else {
@ -83,7 +86,7 @@
double d14 = d13; double d14 = d13;
if (entity instanceof EntityLiving) { if (entity instanceof EntityLiving) {
@@ -254,6 +298,51 @@ @@ -254,6 +301,51 @@
SystemUtils.shuffle(this.toBlow, this.level.random); SystemUtils.shuffle(this.toBlow, this.level.random);
ObjectListIterator objectlistiterator = this.toBlow.iterator(); ObjectListIterator objectlistiterator = this.toBlow.iterator();
@ -135,7 +138,7 @@
while (objectlistiterator.hasNext()) { while (objectlistiterator.hasNext()) {
BlockPosition blockposition = (BlockPosition) objectlistiterator.next(); BlockPosition blockposition = (BlockPosition) objectlistiterator.next();
@@ -272,8 +361,8 @@ @@ -272,8 +364,8 @@
TileEntity tileentity = iblockdata.hasBlockEntity() ? this.level.getBlockEntity(blockposition) : null; TileEntity tileentity = iblockdata.hasBlockEntity() ? this.level.getBlockEntity(blockposition) : null;
LootTableInfo.Builder loottableinfo_builder = (new LootTableInfo.Builder(worldserver)).withRandom(this.level.random).withParameter(LootContextParameters.ORIGIN, Vec3D.atCenterOf(blockposition)).withParameter(LootContextParameters.TOOL, ItemStack.EMPTY).withOptionalParameter(LootContextParameters.BLOCK_ENTITY, tileentity).withOptionalParameter(LootContextParameters.THIS_ENTITY, this.source); LootTableInfo.Builder loottableinfo_builder = (new LootTableInfo.Builder(worldserver)).withRandom(this.level.random).withParameter(LootContextParameters.ORIGIN, Vec3D.atCenterOf(blockposition)).withParameter(LootContextParameters.TOOL, ItemStack.EMPTY).withOptionalParameter(LootContextParameters.BLOCK_ENTITY, tileentity).withOptionalParameter(LootContextParameters.THIS_ENTITY, this.source);
@ -146,7 +149,7 @@
} }
iblockdata.spawnAfterBreak(worldserver, blockposition, ItemStack.EMPTY, flag2); iblockdata.spawnAfterBreak(worldserver, blockposition, ItemStack.EMPTY, flag2);
@@ -305,7 +394,11 @@ @@ -305,7 +397,11 @@
BlockPosition blockposition2 = (BlockPosition) objectlistiterator1.next(); BlockPosition blockposition2 = (BlockPosition) objectlistiterator1.next();
if (this.random.nextInt(3) == 0 && this.level.getBlockState(blockposition2).isAir() && this.level.getBlockState(blockposition2.below()).isSolidRender(this.level, blockposition2.below())) { if (this.random.nextInt(3) == 0 && this.level.getBlockState(blockposition2).isAir() && this.level.getBlockState(blockposition2.below()).isSolidRender(this.level, blockposition2.below())) {
@ -159,7 +162,7 @@
} }
} }
} }
@@ -317,6 +410,7 @@ @@ -317,6 +413,7 @@
} }
private static void addBlockDrops(ObjectArrayList<Pair<ItemStack, BlockPosition>> objectarraylist, ItemStack itemstack, BlockPosition blockposition) { private static void addBlockDrops(ObjectArrayList<Pair<ItemStack, BlockPosition>> objectarraylist, ItemStack itemstack, BlockPosition blockposition) {