Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
14be4180f6 Use updatingChunks for flush saving (#6533)
2973e1c56e Always use updatingChunks for saveAllChunks (#6534)
This commit is contained in:
William Blake Galbreath
2021-08-31 21:29:08 -05:00
parent baa7b78057
commit 68f9e6d9bd
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 mcVersion = 1.17.1
packageVersion = 1_17_R1 packageVersion = 1_17_R1
paperCommit = 2cd4bcfba17affba734619682800fa47ed8e2c7f paperCommit = 2973e1c56e52d28f259b25d685deb59fa3a3fe1f
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = 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.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight); 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 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index b556c1ef5d9f4667fa755ae843f4f50719c5013c..1312a4d7a6f77d4b9812edd44ed27a6ca7cd7977 100644 index 730d569bd657049c8165d931ac62bf21c65a3b29..a8dfee5fb36d4fdf90bdd429476427866b2b052d 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2403,8 +2403,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially @@ -2412,8 +2412,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance); return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
} }
@@ -1726,7 +1726,7 @@ index b556c1ef5d9f4667fa755ae843f4f50719c5013c..1312a4d7a6f77d4b9812edd44ed27a6c
Iterator iterator = this.entity.getIndirectPassengers().iterator(); Iterator iterator = this.entity.getIndirectPassengers().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -2416,6 +2436,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially @@ -2425,6 +2445,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
i = j; 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 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 1312a4d7a6f77d4b9812edd44ed27a6ca7cd7977..f3252dbb7f081b7f47a0e28e74a1da6c42cdd788 100644 index a8dfee5fb36d4fdf90bdd429476427866b2b052d..b99a0d754d2becd429d5b38f4aa36ddaa6a00443 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2273,7 +2273,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially @@ -2282,7 +2282,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
public class TrackedEntity { public class TrackedEntity {