From 78b0bcc5ef91c0ecd04505ed056495d504f7d80b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Oct 2021 16:58:44 -0500 Subject: [PATCH] Updated Upstream (Paper & Airplane) Upstream has released updates that appear to apply and compile correctly Paper Changes: https://github.com/PaperMC/Paper/commit/2ec6c991523c6c1809809ea5ebca0e37d4f5bf7f ci: Update gh actions with caching (#6819) [ci skip] Airplane Changes: https://github.com/TECHNOVE/Airplane/commit/7a52870a45f4135a3a25a1991938c0c1366338e1 Upstream https://github.com/TECHNOVE/Airplane/commit/0afb2b901ab3d178e08bc964a80918a3eca4e69f Fix entity hard collision issue. (#69) --- gradle.properties | 2 +- patches/server/0001-Airplane-Server-Changes.patch | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4061c4c34..6d373aad8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = 9472d38f3c05a9f833cac72368cf49eb419200a1 +paperCommit = 2ec6c991523c6c1809809ea5ebca0e37d4f5bf7f org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch index 59faccb7e..9abae36fd 100644 --- a/patches/server/0001-Airplane-Server-Changes.patch +++ b/patches/server/0001-Airplane-Server-Changes.patch @@ -2153,18 +2153,23 @@ index 0000000000000000000000000000000000000000..a7f297ebb569f7c1f205e967ca485be7 + } +} diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java -index 98ca1199a823cdf55b913396ce0a24554e85f116..840142d340d4569772552b961f829ca921b15dc4 100644 +index 98ca1199a823cdf55b913396ce0a24554e85f116..b16e65fa8be40f6c938c8c183c9bca7c13acc9e2 100644 --- a/src/main/java/io/papermc/paper/util/CollisionUtil.java +++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java -@@ -547,6 +547,13 @@ public final class CollisionUtil { +@@ -547,6 +547,18 @@ public final class CollisionUtil { return ret; } + public static boolean getEntityCollisionsWithCache(final net.minecraft.world.level.Level getter, Entity entity, AABB aabb, List into, + final boolean loadChunks, final boolean collidesWithUnloaded, + final boolean checkBorder, final boolean checkOnly, final BiPredicate predicate) { -+ return entity.collisionCache.getCollisions(getter, aabb, into, collidesWithUnloaded, checkOnly, predicate) || -+ getEntityHardCollisions(getter, entity, aabb, into, checkOnly, null); ++ if (checkOnly) { ++ return entity.collisionCache.getCollisions(getter, aabb, into, collidesWithUnloaded, checkOnly, predicate) || ++ getEntityHardCollisions(getter, entity, aabb, into, checkOnly, null); ++ } else { ++ return entity.collisionCache.getCollisions(getter, aabb, into, collidesWithUnloaded, checkOnly, predicate) | ++ getEntityHardCollisions(getter, entity, aabb, into, checkOnly, null); ++ } + } + public static boolean getEntityHardCollisions(final CollisionGetter getter, final Entity entity, AABB aabb,