Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
e562840 Fix entities suffocating on world gen spawn
1fc0b92 Change mc dev import format to new format
This commit is contained in:
William Blake Galbreath
2021-07-03 22:23:39 -05:00
parent 3cb81112e2
commit 4fcfad7b8e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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..3e8cbd9a0be1ecef7361446d03a4f25336ed6229 index 0000000000000000000000000000000000000000..d08289dda13d31ec1019722af554dc1d834b41e4
--- /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 @@
@@ -6305,7 +6305,7 @@ index 0000000000000000000000000000000000000000..3e8cbd9a0be1ecef7361446d03a4f253
+ final boolean checkBorder, final boolean checkOnly, final BiPredicate<BlockState, BlockPos> predicate) { + final boolean checkBorder, final boolean checkOnly, final BiPredicate<BlockState, BlockPos> predicate) {
+ boolean ret = false; + boolean ret = false;
+ +
+ if (entity != null) { + if (checkBorder) {
+ if (CollisionUtil.isAlmostCollidingOnBorder(getter.getWorldBorder(), aabb)) { + if (CollisionUtil.isAlmostCollidingOnBorder(getter.getWorldBorder(), aabb)) {
+ if (checkOnly) { + if (checkOnly) {
+ return true; + return true;
@@ -6350,7 +6350,7 @@ index 0000000000000000000000000000000000000000..3e8cbd9a0be1ecef7361446d03a4f253
+ +
+ ServerChunkCache chunkProvider; + ServerChunkCache chunkProvider;
+ if (getter instanceof WorldGenRegion) { + if (getter instanceof WorldGenRegion) {
+ chunkProvider = (ServerChunkCache)((WorldGenRegion)getter).getChunkSource(); + chunkProvider = null;
+ } else if (getter instanceof ServerLevel) { + } else if (getter instanceof ServerLevel) {
+ chunkProvider = ((ServerLevel)getter).getChunkSource(); + chunkProvider = ((ServerLevel)getter).getChunkSource();
+ } else { + } else {