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:
90da862 Fix NPE in hard collision checks
This commit is contained in:
William Blake Galbreath
2021-07-04 01:35:25 -05:00
parent 4fcfad7b8e
commit 1a2d7015b0
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..d08289dda13d31ec1019722af554dc1d834b41e4 index 0000000000000000000000000000000000000000..089d66ce4913e97c5fc79daee0f2fd932664f28f
--- /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..d08289dda13d31ec1019722af554dc1d
+ 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 != null && entity.canCollideWith(otherEntity))) {
+ if (checkOnly) { + if (checkOnly) {
+ return true; + return true;
+ } else { + } else {