From 8613f668b191deec8ed250bf9c703e68186c2ea2 Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Sun, 9 Jun 2024 01:36:03 +0100 Subject: [PATCH] pushed last commit too early --- ...063-Rewrite-and-Optimise-Block-Collisions.patch | 14 +++++++++----- patches/server/0065-Defence-Patches.patch | 10 +++++----- ...-Move-EntityFallingBlock-blockposition-up.patch | 8 ++++---- .../0076-AntiXray-Replacement-DuskBerry.patch | 8 ++++---- ...omparison-operator-used-in-entity-height-.patch | 10 +++++----- .../server/0081-Cache-Sand-Layer-Movement.patch | 8 ++++---- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/patches/server/0063-Rewrite-and-Optimise-Block-Collisions.patch b/patches/server/0063-Rewrite-and-Optimise-Block-Collisions.patch index 54749bc..1e753d0 100644 --- a/patches/server/0063-Rewrite-and-Optimise-Block-Collisions.patch +++ b/patches/server/0063-Rewrite-and-Optimise-Block-Collisions.patch @@ -1,4 +1,4 @@ -From 6c73bfce363fd21231c5db80f93cbfbab3080852 Mon Sep 17 00:00:00 2001 +From b561c862269ebe05c78f568cef92b739c3ca11e6 Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Sat, 17 Jun 2023 15:47:14 +0100 Subject: [PATCH] Rewrite and Optimise Block Collisions @@ -926,10 +926,10 @@ index 2f7ccceef..0baab1f19 100644 if (this.S > 0.0F && flag1 && (d6 != d0 || d8 != d2)) { diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index f0e3a96e3..d5e7555b7 100644 +index f0e3a96e3..c1dde1c8c 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -84,6 +84,14 @@ public class EntityFallingBlock extends Entity { +@@ -84,6 +84,16 @@ public class EntityFallingBlock extends Entity { } } // Blossom end @@ -938,6 +938,8 @@ index f0e3a96e3..d5e7555b7 100644 + public void move(double d0, double d1, double d2) { + if (me.samsuik.blossom.configuration.BlossomConfig.useFastBlockCollisions) { + super.move_cannon(d0, d1, d2); ++ } else { ++ super.move(d0, d1, d2); + } + } + // Blossom end @@ -945,10 +947,10 @@ index f0e3a96e3..d5e7555b7 100644 public void t_() { Block block = this.block.getBlock(); diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 0e1319f47..be9bbbe3c 100644 +index 0e1319f47..4745113cf 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -@@ -100,6 +100,14 @@ public class EntityTNTPrimed extends Entity { +@@ -100,6 +100,16 @@ public class EntityTNTPrimed extends Entity { } */ // Blossom end @@ -957,6 +959,8 @@ index 0e1319f47..be9bbbe3c 100644 + public void move(double d0, double d1, double d2) { + if (me.samsuik.blossom.configuration.BlossomConfig.useFastBlockCollisions) { + super.move_cannon(d0, d1, d2); ++ } else { ++ super.move(d0, d1, d2); + } + } + // Blossom end diff --git a/patches/server/0065-Defence-Patches.patch b/patches/server/0065-Defence-Patches.patch index 9f5bf36..00bbc42 100644 --- a/patches/server/0065-Defence-Patches.patch +++ b/patches/server/0065-Defence-Patches.patch @@ -1,4 +1,4 @@ -From 82df20eeb706da4e4e1805533a3dccc565ca5eb0 Mon Sep 17 00:00:00 2001 +From 1d2a02bc9af71e522d785076d84b6d347b66c84b Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Mon, 19 Jun 2023 18:57:22 +0100 Subject: [PATCH] Defence Patches @@ -53,10 +53,10 @@ index 0baab1f19..55556b235 100644 moveX *= 0.25D; moveY *= 0.05000000074505806D; diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index d5e7555b7..4c2258bb7 100644 +index c1dde1c8c..264be6256 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -92,6 +92,21 @@ public class EntityFallingBlock extends Entity { +@@ -94,6 +94,21 @@ public class EntityFallingBlock extends Entity { } } // Blossom end @@ -78,7 +78,7 @@ index d5e7555b7..4c2258bb7 100644 public void t_() { Block block = this.block.getBlock(); -@@ -104,6 +119,12 @@ public class EntityFallingBlock extends Entity { +@@ -106,6 +121,12 @@ public class EntityFallingBlock extends Entity { this.lastZ = this.locZ; BlockPosition blockposition; @@ -91,7 +91,7 @@ index d5e7555b7..4c2258bb7 100644 if (this.ticksLived++ == 0) { blockposition = new BlockPosition(this); if (this.world.getType(blockposition).getBlock() == block && !CraftEventFactory.callEntityChangeBlockEvent(this, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) { -@@ -146,7 +167,7 @@ public class EntityFallingBlock extends Entity { +@@ -148,7 +169,7 @@ public class EntityFallingBlock extends Entity { if (this.world.getType(blockposition).getBlock() != Blocks.PISTON_EXTENSION) { this.die(); if (!this.e) { diff --git a/patches/server/0069-Move-EntityFallingBlock-blockposition-up.patch b/patches/server/0069-Move-EntityFallingBlock-blockposition-up.patch index 55fd80c..8e0e703 100644 --- a/patches/server/0069-Move-EntityFallingBlock-blockposition-up.patch +++ b/patches/server/0069-Move-EntityFallingBlock-blockposition-up.patch @@ -1,14 +1,14 @@ -From e2f126f5a1145a4c28c2fc11a2a4af8cb90a68ff Mon Sep 17 00:00:00 2001 +From 76d184953c95f9a135b4be290912bdadc858d80b Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Wed, 21 Jun 2023 15:46:57 +0100 Subject: [PATCH] Move EntityFallingBlock blockposition up diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 4c2258bb7..dca1cf232 100644 +index 264be6256..4412f3acf 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -159,8 +159,8 @@ public class EntityFallingBlock extends Entity { +@@ -161,8 +161,8 @@ public class EntityFallingBlock extends Entity { this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; if (!this.world.isClientSide) { @@ -18,7 +18,7 @@ index 4c2258bb7..dca1cf232 100644 this.motX *= 0.699999988079071D; this.motZ *= 0.699999988079071D; this.motY *= -0.5D; -@@ -206,7 +206,7 @@ public class EntityFallingBlock extends Entity { +@@ -208,7 +208,7 @@ public class EntityFallingBlock extends Entity { } } } diff --git a/patches/server/0076-AntiXray-Replacement-DuskBerry.patch b/patches/server/0076-AntiXray-Replacement-DuskBerry.patch index 4babd8f..7a38b74 100644 --- a/patches/server/0076-AntiXray-Replacement-DuskBerry.patch +++ b/patches/server/0076-AntiXray-Replacement-DuskBerry.patch @@ -1,4 +1,4 @@ -From 5ec628435fabd1cee76f95ee26504e514528041d Mon Sep 17 00:00:00 2001 +From f4b7be94061d9af0900a198f614d15973e7698ee Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Fri, 30 Jun 2023 15:13:08 +0100 Subject: [PATCH] AntiXray Replacement: DuskBerry @@ -339,10 +339,10 @@ index 60dc31dd7..c77a46cf1 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index dca1cf232..359a00e60 100644 +index 4412f3acf..1a88ba48a 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -129,7 +129,7 @@ public class EntityFallingBlock extends Entity { +@@ -131,7 +131,7 @@ public class EntityFallingBlock extends Entity { blockposition = new BlockPosition(this); if (this.world.getType(blockposition).getBlock() == block && !CraftEventFactory.callEntityChangeBlockEvent(this, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) { this.world.setAir(blockposition); @@ -351,7 +351,7 @@ index dca1cf232..359a00e60 100644 } else if (!this.world.isClientSide) { this.die(); return; -@@ -172,7 +172,7 @@ public class EntityFallingBlock extends Entity { +@@ -174,7 +174,7 @@ public class EntityFallingBlock extends Entity { return; } this.world.setTypeAndData(blockposition, this.block, 3); diff --git a/patches/server/0078-Fix-wrong-comparison-operator-used-in-entity-height-.patch b/patches/server/0078-Fix-wrong-comparison-operator-used-in-entity-height-.patch index 72cea74..d7ab399 100644 --- a/patches/server/0078-Fix-wrong-comparison-operator-used-in-entity-height-.patch +++ b/patches/server/0078-Fix-wrong-comparison-operator-used-in-entity-height-.patch @@ -1,14 +1,14 @@ -From 22f7898453387c2690aa8ff7ca12f7f150dc972d Mon Sep 17 00:00:00 2001 +From 902fb03b6a207930ae450c557eca57f2007a83b9 Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Sat, 1 Jul 2023 22:55:49 +0100 Subject: [PATCH] Fix wrong comparison operator used in entity height nerf diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 359a00e60..63e50ed4d 100644 +index 1a88ba48a..e6563adeb 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java -@@ -146,7 +146,7 @@ public class EntityFallingBlock extends Entity { +@@ -148,7 +148,7 @@ public class EntityFallingBlock extends Entity { // PaperSpigot end // PaperSpigot start - Drop falling blocks above the specified height @@ -18,10 +18,10 @@ index 359a00e60..63e50ed4d 100644 this.a(new ItemStack(block, 1, block.getDropData(this.block)), 0.0F); } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index be9bbbe3c..55ee4cfca 100644 +index 4745113cf..25fe06adc 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -@@ -118,7 +118,7 @@ public class EntityTNTPrimed extends Entity { +@@ -120,7 +120,7 @@ public class EntityTNTPrimed extends Entity { this.move(this.motX, this.motY, this.motZ); // PaperSpigot start - Drop TNT entities above the specified height diff --git a/patches/server/0081-Cache-Sand-Layer-Movement.patch b/patches/server/0081-Cache-Sand-Layer-Movement.patch index 4b708e7..7ae0072 100644 --- a/patches/server/0081-Cache-Sand-Layer-Movement.patch +++ b/patches/server/0081-Cache-Sand-Layer-Movement.patch @@ -1,4 +1,4 @@ -From 11030797b7d2cd8a6f2646bfdf62e1c190e8d3a5 Mon Sep 17 00:00:00 2001 +From 0e623e970beefaf713d49ebf954a68e8243fe485 Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Tue, 4 Jul 2023 00:40:02 +0100 Subject: [PATCH] Cache Sand Layer Movement @@ -49,7 +49,7 @@ index aee4cec57..6599c0142 100644 return new Vec3D(this.locX, this.locY, this.locZ); } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 63e50ed4d..b9ce5d0c9 100644 +index e6563adeb..b8e8b3983 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -87,6 +87,7 @@ public class EntityFallingBlock extends Entity { @@ -59,8 +59,8 @@ index 63e50ed4d..b9ce5d0c9 100644 + if (me.samsuik.blossom.configuration.BlossomConfig.groupedSandMovement && mimic()) return; // Blossom if (me.samsuik.blossom.configuration.BlossomConfig.useFastBlockCollisions) { super.move_cannon(d0, d1, d2); - } -@@ -107,6 +108,54 @@ public class EntityFallingBlock extends Entity { + } else { +@@ -109,6 +110,54 @@ public class EntityFallingBlock extends Entity { } } // Blossom end