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:
PaperMC/Paper@aabf676 Prevent unloading worlds with pending player logins
This commit is contained in:
BillyGalbreath
2022-08-28 14:45:03 -05:00
parent 1c88954c70
commit 7005356a4d
21 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -3145,10 +3145,10 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..88152988425b7b02ec5ce229ba4c24b4
set.clear();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index a030762ea9888b5fab04c5c80acdacccb76f0e46..e3ba1f8f90b5cb8c8bf315f43dae63cd5ba0d77e 100644
index 3d986805c89d22330d6ad1e09760940b2f399214..0c71d72fb04eb00e159ddd456df82376fc912b4e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -690,7 +690,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -693,7 +693,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
gameprofilerfiller.push("tick");
@@ -3170,7 +3170,7 @@ index a030762ea9888b5fab04c5c80acdacccb76f0e46..e3ba1f8f90b5cb8c8bf315f43dae63cd
gameprofilerfiller.pop();
}
}
@@ -757,9 +770,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -760,9 +773,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper start - optimise random block ticking
private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -3183,7 +3183,7 @@ index a030762ea9888b5fab04c5c80acdacccb76f0e46..e3ba1f8f90b5cb8c8bf315f43dae63cd
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
ChunkPos chunkcoordintpair = chunk.getPos();
boolean flag = this.isRaining();
@@ -770,7 +785,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -773,7 +788,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
gameprofilerfiller.push("thunder");
final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
@@ -3192,7 +3192,7 @@ index a030762ea9888b5fab04c5c80acdacccb76f0e46..e3ba1f8f90b5cb8c8bf315f43dae63cd
blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
if (this.isRainingAt(blockposition)) {
DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
@@ -794,7 +809,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -797,7 +812,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
gameprofilerfiller.popPush("iceandsnow");
@@ -5664,7 +5664,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b777c1294370bdc68bc6265b039e2a405d89f2f5..a464d0a771875d3574fe4e461abe7212a933baf5 100644
index b443aba38258f501f8f00be6b055f07b709277c4..660d3f6e8a59751aa1d5b71f5bab72254b6065b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper