From 493ee9db4c44feeda35b835894186296c5a8ca5f Mon Sep 17 00:00:00 2001 From: Samsuik Date: Thu, 14 Dec 2023 02:12:25 +0000 Subject: [PATCH] Fix mistake while adding cannon physics at last minute --- patches/server/0020-Optimised-Explosions.patch | 4 ++-- patches/server/0040-Configure-cannon-physics-by-version.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0020-Optimised-Explosions.patch b/patches/server/0020-Optimised-Explosions.patch index ad9f13a..4687aef 100644 --- a/patches/server/0020-Optimised-Explosions.patch +++ b/patches/server/0020-Optimised-Explosions.patch @@ -142,7 +142,7 @@ index 0000000000000000000000000000000000000000..3f6f34cc617efaad420485a7f613cfca +} diff --git a/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java b/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java new file mode 100644 -index 0000000000000000000000000000000000000000..8a8b4169c8928459f6b51150bd8e67d0a309ca08 +index 0000000000000000000000000000000000000000..b87748ae90863abe8f85dcbdc5a202cb3c9e2037 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java @@ -0,0 +1,403 @@ @@ -311,7 +311,7 @@ index 0000000000000000000000000000000000000000..8a8b4169c8928459f6b51150bd8e67d0 + + // update explosion position + x = source.getX(); -+ y = source.getY(); ++ y = source.getY(0.0625D); + z = source.getZ(); + } + diff --git a/patches/server/0040-Configure-cannon-physics-by-version.patch b/patches/server/0040-Configure-cannon-physics-by-version.patch index cc16cde..a5c61ec 100644 --- a/patches/server/0040-Configure-cannon-physics-by-version.patch +++ b/patches/server/0040-Configure-cannon-physics-by-version.patch @@ -36,14 +36,14 @@ index ae2eede559bd9fe7e500ce180f2ac102a95d3856..7ced5ae768cbea9ee0a7bab2365fbaef if (xSmaller && z != 0.0) { z = performAABBCollisionsZ(axisalignedbb, z, aabbs); diff --git a/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java b/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java -index 8a8b4169c8928459f6b51150bd8e67d0a309ca08..a291516ec7bdb9d8b840f41ca52e6bbaf8e2e08a 100644 +index b87748ae90863abe8f85dcbdc5a202cb3c9e2037..a291516ec7bdb9d8b840f41ca52e6bbaf8e2e08a 100644 --- a/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java +++ b/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java @@ -163,7 +163,7 @@ public class SakuraExplosion extends Explosion { // update explosion position x = source.getX(); -- y = source.getY(); +- y = source.getY(0.0625D); + y = physics.before(1_10_0) ? source.getY() + (double) 0.49f : source.getY(0.0625D); z = source.getZ(); }