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)

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

Paper Changes:
a615186502 Remove the old updatingChunks and visibleChunks fields (#6535)
This commit is contained in:
William Blake Galbreath
2021-08-31 23:17:11 -05:00
parent 68f9e6d9bd
commit cdbf59da1d
3 changed files with 6 additions and 6 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 = 2973e1c56e52d28f259b25d685deb59fa3a3fe1f
paperCommit = a6151865026f70340268d4db1712a9b04e75b8c2
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -1694,10 +1694,10 @@ index 7b6c547e71230fbb3733f99a4597b3f5b51547b8..8242200f073aee40482b190c7c0aafd5
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 730d569bd657049c8165d931ac62bf21c65a3b29..a8dfee5fb36d4fdf90bdd429476427866b2b052d 100644
index 4386402e5e55438475c48b023c61bfb2dbe71a8f..2eacfbe3512f374169d96ac66c8be5a4f1561b6a 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2412,8 +2412,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
@@ -2402,8 +2402,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
}
@@ -1726,7 +1726,7 @@ index 730d569bd657049c8165d931ac62bf21c65a3b29..a8dfee5fb36d4fdf90bdd42947642786
Iterator iterator = this.entity.getIndirectPassengers().iterator();
while (iterator.hasNext()) {
@@ -2425,6 +2445,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
@@ -2415,6 +2435,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
i = j;
}
}

4
patches/server/0073-Item-entity-immunities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index a8dfee5fb36d4fdf90bdd429476427866b2b052d..b99a0d754d2becd429d5b38f4aa36ddaa6a00443 100644
index 2eacfbe3512f374169d96ac66c8be5a4f1561b6a..676b1585233a0824b03894ab3ae6b024c7776bd6 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2282,7 +2282,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
@@ -2272,7 +2272,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
public class TrackedEntity {