Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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

30
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -371,7 +371,7 @@ index 30093cd8bd35f0bbc8f26eca370622ee12a046b6..2986f110348b376bcdc64fa39b688855
++j;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index dbc32731718eed3aa749b811feebe2664bf142ed..5ac4f0b3dc441b3388f87ac0fa3fa89e8d355bea 100644
index 01a6751f096eec3e7b2f854550fd812dabb52a90..4dac83e54c82272f0f73663e9367bdaf7a49355b 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1000,20 +1000,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -586,10 +586,10 @@ index de4b8001ff0ddb1603fcca2b6829bb55289d651e..1c49aec79581c6bbeaeb87e42f98ed22
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b802137d198 100644
index 5a800731927ca20e95fbcd0e8b94999e52642a8e..f561fa1acfcfc78fc2a3a5fe1c12d43a9e708146 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -616,12 +616,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -619,12 +619,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
// Paper end - optimise checkDespawn
@@ -605,7 +605,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
this.advanceWeatherCycle();
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
long j;
@@ -648,32 +648,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -651,32 +651,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.updateSkyBrightness();
this.tickTime();
@@ -646,7 +646,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
if (flag) {
@@ -681,12 +681,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -684,12 +684,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
if (flag || this.emptyTime++ < 300) {
@@ -662,7 +662,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -696,9 +696,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -699,9 +699,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
entity.discard();
} else {
@@ -674,7 +674,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - now always true if in the ticking list
Entity entity1 = entity.getVehicle();
@@ -710,7 +710,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -713,7 +713,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.stopRiding();
}
@@ -683,7 +683,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
// Pufferfish start - copied from this.guardEntityTick
try {
this.tickNonPassenger(entity); // Pufferfish - changed
@@ -725,22 +725,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -728,22 +728,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
}
// Pufferfish end
@@ -711,7 +711,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
}
@Override
@@ -822,9 +822,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -825,9 +825,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
boolean flag = this.isRaining();
int j = chunkcoordintpair.getMinBlockX();
int k = chunkcoordintpair.getMinBlockZ();
@@ -723,7 +723,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0 &&*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - disable thunder // Pufferfish - replace random with shouldDoLightning
@@ -856,7 +856,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -859,7 +859,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
@@ -732,7 +732,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
if (!this.paperConfig().environment.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper - Disable ice and snow // Paper - optimise random ticking // Pufferfish - optimize further random ticking
// Paper start - optimise chunk ticking
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
@@ -892,7 +892,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -895,7 +895,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper start - optimise random block ticking
@@ -741,7 +741,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
//timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
if (randomTickSpeed > 0) {
LevelChunkSection[] sections = chunk.getSections();
@@ -928,7 +928,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -931,7 +931,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper end - optimise random block ticking
//timings.chunkTicksBlocks.stopTiming(); // Paper // Purpur
@@ -750,7 +750,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
}
public Optional<BlockPos> findLightningRod(BlockPos pos) {
@@ -1225,19 +1225,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1228,19 +1228,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
//try { // Purpur
// Paper end - timings
entity.setOldPosAndRot();
@@ -775,7 +775,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
//} finally { timer.stopTiming(); } // Paper - timings // Purpur
Iterator iterator = entity.getPassengers().iterator();
@@ -1266,12 +1266,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1269,12 +1269,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -792,7 +792,7 @@ index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b80
// Paper start - EAR 2
if (isActive) {
passenger.rideTick();
@@ -1283,7 +1283,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1286,7 +1286,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
vehicle.positionRider(passenger);
}
// Paper end - EAR 2