From 47b8b50f30f32b78206df4b6ed7b13eccf123f8c Mon Sep 17 00:00:00 2001 From: Samsuik Date: Thu, 31 Oct 2024 12:31:59 +0000 Subject: [PATCH] update explosions --- ...mise-explosions-in-protected-regions.patch | 4 +-- .../server/0019-Specialised-Explosions.patch | 28 ++++++++----------- ...-Configure-cannon-physics-by-version.patch | 8 +++--- ...0072-Set-entity-impulse-on-explosion.patch | 6 ++-- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/patches/server/0018-Optimise-explosions-in-protected-regions.patch b/patches/server/0018-Optimise-explosions-in-protected-regions.patch index 5450769..8db44a9 100644 --- a/patches/server/0018-Optimise-explosions-in-protected-regions.patch +++ b/patches/server/0018-Optimise-explosions-in-protected-regions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimise explosions in protected regions diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 10432b31acd047ac2aa8581f2ee863254ec8d1eb..6001583d054b9690e34b6878b1298d93e6552a2a 100644 +index 10432b31acd047ac2aa8581f2ee863254ec8d1eb..b07c2eb8cc3cc54e8ab72c5ed3d6d7623416e7fb 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -345,6 +345,22 @@ public class ServerExplosion implements Explosion { @@ -36,7 +36,7 @@ index 10432b31acd047ac2aa8581f2ee863254ec8d1eb..6001583d054b9690e34b6878b1298d93 } // Sakura end - optimise paper explosions + // Sakura start - optimise protected explosions -+ if (this.isRegionUnprotected()) { ++ if (!this.isRegionUnprotected()) { + return ret; + } + // Sakura end - optimise protected explosions diff --git a/patches/server/0019-Specialised-Explosions.patch b/patches/server/0019-Specialised-Explosions.patch index eebe174..1e13552 100644 --- a/patches/server/0019-Specialised-Explosions.patch +++ b/patches/server/0019-Specialised-Explosions.patch @@ -23,15 +23,16 @@ index c21e00812f1aaa1279834a0562d360d6b89e146c..1e1329adde1457898a3002279b53b1bb 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..161728f788ef6bfebbc9efb6560d1af933907f42 +index 0000000000000000000000000000000000000000..82a448a18415ff0e050d26aaa8fcfe844631768f --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -@@ -0,0 +1,205 @@ +@@ -0,0 +1,202 @@ +package me.samsuik.sakura.explosion.special; + +import ca.spottedleaf.moonrise.common.util.WorldUtil; +import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.ChunkEntitySlices; +import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.EntityLookup; ++import it.unimi.dsi.fastutil.objects.ObjectArrayList; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.Mth; @@ -73,7 +74,7 @@ index 0000000000000000000000000000000000000000..161728f788ef6bfebbc9efb6560d1af9 + public final void explode() { + if (this.radius() < 0.1F) { + // (radius < 0.1F) in bukkit is assumed to not be able to find any blocks or entities. -+ for (int i = 1; i < this.getExplosionCount(); ++i) { ++ for (int i = this.getExplosionCount() - 1; i >= 0; --i) { + this.finalizeExplosionAndParticles(List.of()); + } + } else { @@ -93,18 +94,14 @@ index 0000000000000000000000000000000000000000..161728f788ef6bfebbc9efb6560d1af9 + + protected final boolean finalizeExplosionAndParticles(List blocks) { + this.wasCanceled = false; -+ this.interactWithBlocks(blocks); -+ boolean destroyedBlocks = !blocks.isEmpty(); -+ -+ if (!this.interactsWithBlocks()) { -+ blocks.clear(); // server sends block changes in the explosion packet -+ } ++ List explodedPositions = new ObjectArrayList<>(blocks); ++ this.interactWithBlocks(explodedPositions); + + if (!this.wasCanceled) { + this.applyEffects.accept(this); + } + -+ return destroyedBlocks; ++ return !explodedPositions.isEmpty(); + } + + protected void postExplosion(List foundBlocks, boolean destroyedBlocks) { @@ -234,10 +231,10 @@ index 0000000000000000000000000000000000000000..161728f788ef6bfebbc9efb6560d1af9 +} 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..45d9204f888c57d27ac5544e42f779ba425fcc4a +index 0000000000000000000000000000000000000000..ebe5f0c8c2f09920b5f5ef734e63f5e7cd8bd3a1 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java -@@ -0,0 +1,202 @@ +@@ -0,0 +1,201 @@ +package me.samsuik.sakura.explosion.special; + +import ca.spottedleaf.moonrise.common.list.IteratorSafeOrderedReferenceSet; @@ -291,12 +288,11 @@ index 0000000000000000000000000000000000000000..45d9204f888c57d27ac5544e42f779ba + Vec3 previousMomentum = this.cause.entityState().momentum(); + boolean lastCycle = i == 0; + List toBlow = this.midExplosion(previousMomentum, lastCycle); // search for blocks and impact entities ++ boolean destroyedBlocks = this.finalizeExplosionAndParticles(toBlow); + + if (!lastCycle) { + EntityState entityState = this.nextSourceVelocity(); -+ List foundBlocks = new ObjectArrayList<>(toBlow); -+ boolean destroyedBlocks = this.finalizeExplosionAndParticles(toBlow); -+ this.postExplosion(foundBlocks, destroyedBlocks); // update wrapped, clear recent block cache ++ this.postExplosion(toBlow, destroyedBlocks); // update wrapped, clear recent block cache + this.updateExplosionPosition(entityState, destroyedBlocks); + } + } @@ -512,7 +508,7 @@ index 6b739e820af6333c1ff3a4b87154d4c00c9a5559..0a9e62dd90c6aba4ff97391d69f9a92d // Sakura end - merge cannon entities diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 6001583d054b9690e34b6878b1298d93e6552a2a..11b12c1c4eff015bc40c7e7e965badb3f3fd272e 100644 +index b07c2eb8cc3cc54e8ab72c5ed3d6d7623416e7fb..9381a6810e709194dc50651cd2518942f1d91dec 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -52,9 +52,9 @@ public class ServerExplosion implements Explosion { diff --git a/patches/server/0037-Configure-cannon-physics-by-version.patch b/patches/server/0037-Configure-cannon-physics-by-version.patch index b8f542f..d1e5fc3 100644 --- a/patches/server/0037-Configure-cannon-physics-by-version.patch +++ b/patches/server/0037-Configure-cannon-physics-by-version.patch @@ -67,10 +67,10 @@ index 149e461fcb23b2ed7ae8dcc09837de501ba9eafb..613d2d90571546a482ba493fae5cbc7c 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 161728f788ef6bfebbc9efb6560d1af933907f42..ca96bec3333b59b620a657c3c0d153e4596a5459 100644 +index 82a448a18415ff0e050d26aaa8fcfe844631768f..449fa5518a1f9013dbd41dc4bfe3ff8a57b94a30 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -@@ -163,9 +163,15 @@ public abstract class SpecialisedExplosion extends ServerExplo +@@ -160,9 +160,15 @@ public abstract class SpecialisedExplosion extends ServerExplo if (distanceFromBottom <= 1.0) { double x = entity.getX() - pos.x; @@ -88,7 +88,7 @@ index 161728f788ef6bfebbc9efb6560d1af933907f42..ca96bec3333b59b620a657c3c0d153e4 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 45d9204f888c57d27ac5544e42f779ba425fcc4a..048946c210e263b90880a431ea5ff243932c3e0f 100644 +index ebe5f0c8c2f09920b5f5ef734e63f5e7cd8bd3a1..320cdb1f4e655a2d093890e88476df90ed436ae5 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 { @@ -631,7 +631,7 @@ index 0ae2d83055252146e346b06cc8360eef56d39f5c..8c41282eafc1201bf1c0d001fb4fe791 public final me.samsuik.sakura.explosion.density.BlockDensityCache densityCache = new me.samsuik.sakura.explosion.density.BlockDensityCache(); // Sakura - explosion density cache public final me.samsuik.sakura.explosion.durable.DurableBlockManager durabilityManager = new me.samsuik.sakura.explosion.durable.DurableBlockManager(); // Sakura - explosion durable blocks diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 1a912813ab7fa112379876ea1d4c903afe45c069..97debcf36d4aa3f8a6c83d35c53ba95342966fbf 100644 +index 5f2657e3baa6a9be301d36a456dd8d1135d78857..145417fd4623b5bdf6daac8fd100d6b572651153 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -413,6 +413,7 @@ public class ServerExplosion implements Explosion { diff --git a/patches/server/0072-Set-entity-impulse-on-explosion.patch b/patches/server/0072-Set-entity-impulse-on-explosion.patch index 391a969..23b0f4d 100644 --- a/patches/server/0072-Set-entity-impulse-on-explosion.patch +++ b/patches/server/0072-Set-entity-impulse-on-explosion.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Set entity impulse on explosion 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 ca96bec3333b59b620a657c3c0d153e4596a5459..51388b968a96fef99e0db250a55266ebde03d903 100644 +index 449fa5518a1f9013dbd41dc4bfe3ff8a57b94a30..e4f4ae1ce4703e93664e3c2b97a8cae1e62aaebd 100644 --- a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java -@@ -206,6 +206,7 @@ public abstract class SpecialisedExplosion extends ServerExplo +@@ -203,6 +203,7 @@ public abstract class SpecialisedExplosion extends ServerExplo moveZ += z; } @@ -17,7 +17,7 @@ index ca96bec3333b59b620a657c3c0d153e4596a5459..51388b968a96fef99e0db250a55266eb } } diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 280308766cd41924e209d5816c047ceae0ec1085..2bc39d43c161dcbc2a8ff88fff7409d0c41fd588 100644 +index a82922cd0e648aa1154638a7ff5c616d37475f9c..4109a781b2882e24a20ec5a5ca87040ad0d99bc3 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -748,6 +748,7 @@ public class ServerExplosion implements Explosion {