From 62de497f25e11aceb097b22bba95180ff62e50b5 Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> Date: Wed, 5 Jun 2024 18:00:37 +0800 Subject: [PATCH] update patches --- gradle.properties | 2 +- ...anges-commit-1f3ad021d3cb996f499d62.patch} | 4 ++-- ...-Changes-commit-1f3ad021d3cb996f499.patch} | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) rename patches/api/{0001-pufferfish-API-Changes-commit-852ea89d9eaa3af12ace88.patch => 0001-pufferfish-API-Changes-commit-1f3ad021d3cb996f499d62.patch} (99%) rename patches/server/{0001-pufferfish-Server-Changes-commit-852ea89d9eaa3af12ac.patch => 0001-pufferfish-Server-Changes-commit-1f3ad021d3cb996f499.patch} (99%) diff --git a/gradle.properties b/gradle.properties index 07f0f6f7..75646725 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = patina.patina version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperRef = 4445d23544e0801fb6f658de98815ce0d8c04f58 +paperRef = ba31f4128208e954d6648001724887352f71ece9 org.gradle.parallel = true org.gradle.caching = true diff --git a/patches/api/0001-pufferfish-API-Changes-commit-852ea89d9eaa3af12ace88.patch b/patches/api/0001-pufferfish-API-Changes-commit-1f3ad021d3cb996f499d62.patch similarity index 99% rename from patches/api/0001-pufferfish-API-Changes-commit-852ea89d9eaa3af12ace88.patch rename to patches/api/0001-pufferfish-API-Changes-commit-1f3ad021d3cb996f499d62.patch index 6ee32393..f74a142f 100644 --- a/patches/api/0001-pufferfish-API-Changes-commit-852ea89d9eaa3af12ace88.patch +++ b/patches/api/0001-pufferfish-API-Changes-commit-1f3ad021d3cb996f499d62.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> -Date: Tue, 23 Apr 2024 09:52:58 +0800 +Date: Fri, 31 May 2024 23:53:25 +0800 Subject: [PATCH] pufferfish API Changes commit - 852ea89d9eaa3af12ace8839275fb8116fc98b08 + 1f3ad021d3cb996f499d627676d688aeb46ffef9 Add Sentry diff --git a/patches/server/0001-pufferfish-Server-Changes-commit-852ea89d9eaa3af12ac.patch b/patches/server/0001-pufferfish-Server-Changes-commit-1f3ad021d3cb996f499.patch similarity index 99% rename from patches/server/0001-pufferfish-Server-Changes-commit-852ea89d9eaa3af12ac.patch rename to patches/server/0001-pufferfish-Server-Changes-commit-1f3ad021d3cb996f499.patch index 3624b36d..3080675f 100644 --- a/patches/server/0001-pufferfish-Server-Changes-commit-852ea89d9eaa3af12ac.patch +++ b/patches/server/0001-pufferfish-Server-Changes-commit-1f3ad021d3cb996f499.patch @@ -1,8 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> -Date: Tue, 23 Apr 2024 09:52:58 +0800 +Date: Fri, 31 May 2024 23:53:25 +0800 Subject: [PATCH] pufferfish Server Changes commit - 852ea89d9eaa3af12ace8839275fb8116fc98b08 + 1f3ad021d3cb996f499d627676d688aeb46ffef9 Pufferfish Utils @@ -2329,7 +2329,7 @@ index 0af9ed92824ccf30814eceb6a2c2e5c12661c991..67eeb39aede6908d2756e49821ca350e } else { this.lastTimeStamp = body.timeStamp(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 27db614d46dffc2d10f18d79cc5a084f3421d86b..2f4873bd9fcc14a9f6736f845834378641b894e9 100644 +index 2dc07e5ef249636e85ad9c78e3729e9e066a8fe8..3bc2a49eac992d33aa61f786448c03f5a853ed23 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 ? -m : 1 - m) { for (int n = m < l && m > -l ? l : 0; n <= l; n = n > 0 ? -n : 1 - n) { mutableBlockPos.setWithOffset(blockPos, m, k - 1, n); @@ -3576,7 +3576,7 @@ index da7489986848316fed029b71d1bc4e1248c9c9a8..661acdf4b1f33d150b0caf179e925d31 return new BlockPos(i, l, j); } diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java -index b865115dc5a8c000521abf668251ab1bd8104505..42af3888a155f114901a90d4028bafed5789f58f 100644 +index 64076a452a315090d299a7a58a43fd3b5c1b4e0a..0c317b0147a73a8075e0883f0c132f4db0bdfea7 100644 --- a/src/main/java/net/minecraft/world/level/biome/Biome.java +++ b/src/main/java/net/minecraft/world/level/biome/Biome.java @@ -63,13 +63,18 @@ public final class Biome { @@ -4002,7 +4002,7 @@ index 37a0002bbe6539648db5219bb373e0404ae48dc0..ca0571d232e102c4b177a1ea44b96f5f } diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java -index 1132658b063c6cd3feb1783ab4d5f5141ab75140..284c76ddb9724b44bb2e93f590685c728e843e6d 100644 +index 88a4a72bb390947dc17e5da09a99b2d1b3ac4621..284c76ddb9724b44bb2e93f590685c728e843e6d 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java +++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java @@ -17,50 +17,69 @@ public class EntityCollisionContext implements CollisionContext { @@ -4089,7 +4089,7 @@ index 1132658b063c6cd3feb1783ab4d5f5141ab75140..284c76ddb9724b44bb2e93f590685c72 @Override public boolean isAbove(VoxelShape shape, BlockPos pos, boolean defaultValue) { -- return this.entityBottom > pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F; +- return this.entityBottom > (double)pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F; + return (this.entity == null ? -Double.MAX_VALUE : entity.getY()) > (double)pos.getY() + shape.max(Direction.Axis.Y) - 1.0E-5F; // Pufferfish }