Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
2ec6c99152 ci: Update gh actions with caching (#6819) [ci skip]

Airplane Changes:
7a52870a45 Upstream
0afb2b901a Fix entity hard collision issue. (#69)
This commit is contained in:
William Blake Galbreath
2021-10-23 16:58:44 -05:00
parent 69c7c31f9a
commit 78b0bcc5ef
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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

13
patches/server/0001-Airplane-Server-Changes.patch
View File

@@ -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<AABB> into,
+ final boolean loadChunks, final boolean collidesWithUnloaded,
+ final boolean checkBorder, final boolean checkOnly, final BiPredicate<BlockState, BlockPos> 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,