From 35ff915cdf25edc1df2eb46c7d01aeee8604c0f4 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Wed, 8 May 2024 21:16:00 +0100 Subject: [PATCH] Fix explosion issues with legacy physics version and merging --- .../server/0021-Specialised-Explosions.patch | 25 ++++++++++++------- ...-Configure-cannon-physics-by-version.patch | 6 ++--- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/patches/server/0021-Specialised-Explosions.patch b/patches/server/0021-Specialised-Explosions.patch index 71e5664..348a4c9 100644 --- a/patches/server/0021-Specialised-Explosions.patch +++ b/patches/server/0021-Specialised-Explosions.patch @@ -23,7 +23,7 @@ index 0fd814f1d65c111266a2b20f86561839a4cef755..932f7a0d030d2d4932e6e6d4a5805e9b if (index >= 0) { diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java new file mode 100644 -index 0000000000000000000000000000000000000000..688a2bbd0b0b60b9acbdb3e6da0b24efed2bfde9 +index 0000000000000000000000000000000000000000..c50a0bb50698244373cbe4843bc800497f01ab77 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java @@ -0,0 +1,198 @@ @@ -210,14 +210,14 @@ index 0000000000000000000000000000000000000000..688a2bbd0b0b60b9acbdb3e6da0b24ef + double density = this.getBlockDensity(pos, entity, this.recentBlockCache, this.mutablePos); // Paper - Optimize explosions // Paper - optimise explosions + double exposure = (1.0D - distanceFromBottom) * density; + -+ x *= exposure; -+ y *= exposure; -+ z *= exposure; -+ + if (exposure == 0.0) { + return; + } + ++ x *= exposure; ++ y *= exposure; ++ z *= exposure; ++ + for (int i = 0; i < potential; ++i) { + entity.addDeltaMovement(x, y, z); + } @@ -227,10 +227,10 @@ index 0000000000000000000000000000000000000000..688a2bbd0b0b60b9acbdb3e6da0b24ef +} diff --git a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java new file mode 100644 -index 0000000000000000000000000000000000000000..71e1774a6db949ad6c01f1283a17a89ae6af8b02 +index 0000000000000000000000000000000000000000..13d87b08b1e12f7b5a6f59f545a4620cacae22ba --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -@@ -0,0 +1,180 @@ +@@ -0,0 +1,187 @@ +package me.samsuik.sakura.explosion.special; + +import io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet; @@ -250,6 +250,7 @@ index 0000000000000000000000000000000000000000..71e1774a6db949ad6c01f1283a17a89a +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; ++import org.bukkit.util.Vector; +import org.jetbrains.annotations.Nullable; + +import java.util.List; @@ -336,8 +337,14 @@ index 0000000000000000000000000000000000000000..71e1774a6db949ad6c01f1283a17a89a + } + } + ++ private Vector getCauseOrigin() { ++ Vector origin = this.cause.getOriginVector(); ++ return origin == null ? new Vector(this.x, this.y, this.z) : origin; ++ } ++ + private EntityState nextSourceVelocity() { -+ PrimedTnt tnt = new PrimedTnt(EntityType.TNT, this.level); ++ Vector origin = this.getCauseOrigin(); // valid position to use while creating a temporary entity ++ PrimedTnt tnt = new PrimedTnt(this.level, origin.getX(), origin.getY(), origin.getZ(), null); + this.cause.entityState().apply(tnt); + this.impactCannonEntity(tnt, this.position, 1, this.radius() * 2.0f); + return EntityState.of(tnt); @@ -362,7 +369,7 @@ index 0000000000000000000000000000000000000000..71e1774a6db949ad6c01f1283a17a89a + // iterate over the entityTickList to find entities that are exploding in the same position. + while ((index = entities.advanceRawIterator(index)) != -1) { + Entity foundEntity = entities.rawGet(index); -+ if (!foundEntity.compareState(this.cause) || !foundEntity.isSafeToMergeInto(this.cause)) ++ if (foundEntity.isRemoved() || !foundEntity.compareState(this.cause) || !foundEntity.isSafeToMergeInto(this.cause)) + break; + base += foundEntity.getStacked(); + foundEntity.discard(); diff --git a/patches/server/0041-Configure-cannon-physics-by-version.patch b/patches/server/0041-Configure-cannon-physics-by-version.patch index a85c2c4..a211795 100644 --- a/patches/server/0041-Configure-cannon-physics-by-version.patch +++ b/patches/server/0041-Configure-cannon-physics-by-version.patch @@ -68,7 +68,7 @@ index 299237a0c828e48425cc35a14d366020c78daefb..8014ebfb391825c31d9d1b39f5304a7e if (xSmaller && z != 0.0) { z = performAABBCollisionsZ(axisalignedbb, z, aabbs); diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -index 688a2bbd0b0b60b9acbdb3e6da0b24efed2bfde9..da45a8f11f9131e7d3dfe6e96060ec8f8fad6160 100644 +index c50a0bb50698244373cbe4843bc800497f01ab77..8dded96414b4a36fe892a8a6b378e79c2444df4e 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java @@ -170,9 +170,15 @@ public abstract class SpecialisedExplosion extends Explosion { @@ -89,10 +89,10 @@ index 688a2bbd0b0b60b9acbdb3e6da0b24efed2bfde9..da45a8f11f9131e7d3dfe6e96060ec8f if (distance != 0.0D) { x /= distance; diff --git a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -index 71e1774a6db949ad6c01f1283a17a89ae6af8b02..9f9efcf983aae4018b9792866f975bf7658706be 100644 +index b0dec3e118f4f9fc9eb3f7c774477422db7bec03..c2d7b621c95a16ffaf07e873ced77d40cd99083b 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -@@ -37,6 +37,13 @@ public final class TntExplosion extends SpecialisedExplosion { +@@ -38,6 +38,13 @@ public final class TntExplosion extends SpecialisedExplosion { this.bounds = new AABB(x, y, z, x, y, z); }