From 46aec003480f304344cbb15f8b5850033922538f Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Sun, 2 Jun 2024 07:13:28 +0000 Subject: [PATCH] Clean patches --- ...rfish-Cache-climbing-check-for-activation.patch | 12 ++---------- .../0023-Pufferfish-Optimize-suffocation.patch | 6 +++--- ...load-chunks-to-activate-climbing-entities.patch | 4 ++-- ...e-Check-frozen-ticks-before-landing-block.patch | 6 +++--- patches/server/0051-KioCG-Chunk-API.patch | 14 +++----------- 5 files changed, 13 insertions(+), 29 deletions(-) diff --git a/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch index b5f1b73..714672b 100644 --- a/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch +++ b/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch @@ -18,18 +18,10 @@ index 643631e11c88285f33d050bf7b4b1e2f63b5c992..94c9f407f526b2d43cf61725b414b113 private Vec3 deltaMovement; private float yRot; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a1e90547816ebf0811e7b22af793f40015d6c4f3..00589ca4361482cdd852d699c4bc632ae85b5dd3 100644 +index a7c0527dd7a8cc30bb42e7ce1342b3f11862ee81..89ff6f509a59b484977ffbdb4e4132a46ca4bbaa 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -150,7 +150,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; - import org.bukkit.event.player.PlayerItemConsumeEvent; - // CraftBukkit end - --import co.aikar.timings.MinecraftTimings; // Paper - - public abstract class LivingEntity extends Entity implements Attackable { - -@@ -2069,6 +2068,20 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2069,6 +2069,20 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.lastClimbablePos; } diff --git a/patches/server/0023-Pufferfish-Optimize-suffocation.patch b/patches/server/0023-Pufferfish-Optimize-suffocation.patch index 02dfbd0..7a362d8 100644 --- a/patches/server/0023-Pufferfish-Optimize-suffocation.patch +++ b/patches/server/0023-Pufferfish-Optimize-suffocation.patch @@ -31,10 +31,10 @@ index 0000000000000000000000000000000000000000..3e48cd297b4869e5c89b6abc43c726d3 + } +} diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 00589ca4361482cdd852d699c4bc632ae85b5dd3..e49d18132e63ba7486c59fbb5cd236a872812e5c 100644 +index 89ff6f509a59b484977ffbdb4e4132a46ca4bbaa..2a7172c987812347e308ae1ed86b3fd430ef04e9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -441,7 +441,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -442,7 +442,7 @@ public abstract class LivingEntity extends Entity implements Attackable { boolean flag = this instanceof net.minecraft.world.entity.player.Player; if (!this.level().isClientSide) { @@ -43,7 +43,7 @@ index 00589ca4361482cdd852d699c4bc632ae85b5dd3..e49d18132e63ba7486c59fbb5cd236a8 this.hurt(this.damageSources().inWall(), 1.0F); } else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) { double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone(); -@@ -1449,6 +1449,19 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -1450,6 +1450,19 @@ public abstract class LivingEntity extends Entity implements Attackable { return this.getHealth() <= 0.0F; } diff --git a/patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch index 8930f4b..a20b680 100644 --- a/patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -52,10 +52,10 @@ index 18c6fe66fa944f5e5b7892df4d8fef4c7346d3bc..a9e32fba699c718011abc52d91ec7158 return this.chunkPosition; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e49d18132e63ba7486c59fbb5cd236a872812e5c..d4ab1b3253e4eeb72dd2e197757b446273bcc10e 100644 +index 2a7172c987812347e308ae1ed86b3fd430ef04e9..0eb73b666fe161fc148e0c0dc2da3362f8452187 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2088,19 +2088,43 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2089,19 +2089,43 @@ public abstract class LivingEntity extends Entity implements Attackable { public boolean onClimableCached() { if (!this.blockPosition().equals(this.lastClimbingPosition)) { diff --git a/patches/server/0038-Gale-Check-frozen-ticks-before-landing-block.patch b/patches/server/0038-Gale-Check-frozen-ticks-before-landing-block.patch index bf9d08e..c0d1e93 100644 --- a/patches/server/0038-Gale-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0038-Gale-Check-frozen-ticks-before-landing-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Gale Check frozen ticks before landing block diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 30ee36f31069a11f87b7bd619020e25a342bae00..fffe8413eec4ae3eda2d21d958aa2534661a0558 100644 +index 0eb73b666fe161fc148e0c0dc2da3362f8452187..bae654c209fc423cafe66f10ba35971af7579710 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -608,11 +608,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -609,11 +609,10 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void tryAddFrost() { @@ -21,7 +21,7 @@ index 30ee36f31069a11f87b7bd619020e25a342bae00..fffe8413eec4ae3eda2d21d958aa2534 if (attributemodifiable == null) { return; -@@ -622,7 +621,6 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -623,7 +622,6 @@ public abstract class LivingEntity extends Entity implements Attackable { attributemodifiable.addTransientModifier(new AttributeModifier(LivingEntity.SPEED_MODIFIER_POWDER_SNOW_UUID, "Powder snow slow", (double) f, AttributeModifier.Operation.ADD_VALUE)); } diff --git a/patches/server/0051-KioCG-Chunk-API.patch b/patches/server/0051-KioCG-Chunk-API.patch index 3e6005d..fe63c93 100644 --- a/patches/server/0051-KioCG-Chunk-API.patch +++ b/patches/server/0051-KioCG-Chunk-API.patch @@ -402,18 +402,10 @@ index e679b40b9628b0eb7152978ef641f9c918c4c8b2..bf9ae765242bb61d3e279893b0355d12 } catch (StackOverflowError ex) { world.lastPhysicsProblem = new BlockPos(pos); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 82b4bd669c57b18fb0b443bcd94495023cd5a528..abd845a124dbe0b9a1868ce378a0b7c7b9b3b818 100644 +index 82b4bd669c57b18fb0b443bcd94495023cd5a528..061f7ef0138d4b8d528c7aa71ec5660c1d7e3b27 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -@@ -25,6 +25,7 @@ import net.minecraft.world.level.block.Blocks; - import net.minecraft.world.level.chunk.ChunkAccess; - import net.minecraft.world.level.chunk.DataLayer; - import net.minecraft.world.level.chunk.ImposterProtoChunk; -+import net.minecraft.world.level.chunk.LevelChunk; - import net.minecraft.world.level.chunk.LevelChunkSection; - import net.minecraft.world.level.chunk.PalettedContainer; - import net.minecraft.world.level.chunk.PalettedContainerRO; -@@ -428,4 +429,12 @@ public class CraftChunk implements Chunk { +@@ -428,4 +428,12 @@ public class CraftChunk implements Chunk { static { Arrays.fill(FULL_LIGHT, (byte) 0xFF); } @@ -421,7 +413,7 @@ index 82b4bd669c57b18fb0b443bcd94495023cd5a528..abd845a124dbe0b9a1868ce378a0b7c7 + // KioCG start - ChunkHot + @Override + public long getChunkHotAvg() { -+ final LevelChunk target = this.worldServer.getChunkIfLoaded(this.x,this.z); ++ final net.minecraft.world.level.chunk.LevelChunk target = this.worldServer.getChunkIfLoaded(this.x,this.z); + return target == null ? -1 : target.getChunkHot().getAverage(); + } + // KioCG end