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

Updated Upstream (Tuinity)

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

Tuinity Changes:
5ce3c24 Fix logic inconsistency with hard colliding entities if no entity is provided
This commit is contained in:
William Blake Galbreath
2021-07-03 20:50:49 -05:00
parent 2d32233ed8
commit cc50963b40
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -5905,7 +5905,7 @@ index 0000000000000000000000000000000000000000..01320aea07b51c97ae5f0654b81d2332
+} +}
diff --git a/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java b/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java diff --git a/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java b/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..e883b2af853666c11a14a541aac331d97c6ad057 index 0000000000000000000000000000000000000000..3e8cbd9a0be1ecef7361446d03a4f25336ed6229
--- /dev/null --- /dev/null
+++ b/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java +++ b/src/main/java/com/tuinity/tuinity/util/CollisionUtil.java
@@ -0,0 +1,600 @@ @@ -0,0 +1,600 @@
@@ -6476,7 +6476,7 @@ index 0000000000000000000000000000000000000000..e883b2af853666c11a14a541aac331d9
+ for (int i = 0, len = entities.size(); i < len; ++i) { + for (int i = 0, len = entities.size(); i < len; ++i) {
+ final Entity otherEntity = entities.get(i); + final Entity otherEntity = entities.get(i);
+ +
+ if ((entity == null || otherEntity.canBeCollidedWith()) || entity.canCollideWith(otherEntity)) { + if ((entity == null && otherEntity.canBeCollidedWith()) || entity.canCollideWith(otherEntity)) {
+ if (checkOnly) { + if (checkOnly) {
+ return true; + return true;
+ } else { + } else {