From d52dc8b2dfb55fec2a9b81107db14c28378d059d Mon Sep 17 00:00:00 2001 From: Samsuik Date: Mon, 22 Jan 2024 15:40:07 +0000 Subject: [PATCH] Rename impactNonLiving -> impactLiving --- patches/server/0020-Optimised-Explosions.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0020-Optimised-Explosions.patch b/patches/server/0020-Optimised-Explosions.patch index 3c1315f..034bb7d 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..b87748ae90863abe8f85dcbdc5a202cb3c9e2037 +index 0000000000000000000000000000000000000000..b44d41314f60eabb72e72621fd6aa6625034ee14 --- /dev/null +++ b/src/main/java/me/samsuik/sakura/explosion/SakuraExplosion.java @@ -0,0 +1,403 @@ @@ -424,7 +424,7 @@ index 0000000000000000000000000000000000000000..b87748ae90863abe8f85dcbdc5a202cb + continue; + } + -+ impactNonLiving(entity, pos, section, x, y, z, exposure, blockPos, blockCache); ++ impactLiving(entity, pos, section, x, y, z, exposure, blockPos, blockCache); + } + + return found; @@ -477,14 +477,14 @@ index 0000000000000000000000000000000000000000..b87748ae90863abe8f85dcbdc5a202cb + } + } else { + for (int i = 0; i < potential; ++i) { -+ impactNonLiving(entity, pos, section, x, y, z, exposure, blockPos, blockCache); ++ impactLiving(entity, pos, section, x, y, z, exposure, blockPos, blockCache); + } + } + } + } + } + -+ private void impactNonLiving(Entity entity, Vec3 pos, Entity[] section, double x, double y, double z, double exposure, BlockPos.MutableBlockPos blockPos, ExplosionBlockCache[] blockCache) { ++ private void impactLiving(Entity entity, Vec3 pos, Entity[] section, double x, double y, double z, double exposure, BlockPos.MutableBlockPos blockPos, ExplosionBlockCache[] blockCache) { + if (this.damageCalculator.shouldDamageEntity(this, entity)) { + // CraftBukkit start +