Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper) (#1169)

Browse Source
This commit is contained in:
frog-commits
2022-10-24 00:46:53 -04:00
committed by GitHub
parent e35f48112e
commit 74b72a5f42
23 changed files with 137 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
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 f702b5777938324e9f10015d8e145225689a37d0..3203b953709ca7cb9172f5912a922131ad7ec9eb 100644
index 91640a6f9770eeb300e0d56d8fe93264c087f0be..5258688cf1c980b95308b6d105dbf104b0276932 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -606,20 +606,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -538,10 +538,10 @@ index 157efbbc57f1b5d92f296a70823c75b6d01ac065..cd5533c3c53215c9cc4be0b9097d76ef
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199a3ad3197 100644
index 4ced6723e65b84f7357acb54e9851e7af3347f11..d418144bc7471b2c00ad272652b035d79974ef75 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -651,12 +651,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -653,12 +653,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
// Paper end - optimise checkDespawn
@@ -557,7 +557,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
this.advanceWeatherCycle();
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
long j;
@@ -683,32 +683,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -685,32 +685,32 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.updateSkyBrightness();
this.tickTime();
@@ -598,7 +598,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
if (flag) {
@@ -716,12 +716,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -718,12 +718,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
if (flag || this.emptyTime++ < 300) {
@@ -614,7 +614,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -731,9 +731,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -733,9 +733,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 {
@@ -626,7 +626,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
if (true || this.chunkSource.chunkMap.getDistanceManager().inEntityTickingRange(entity.chunkPosition().toLong())) { // Paper - now always true if in the ticking list
Entity entity1 = entity.getVehicle();
@@ -745,7 +745,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -747,7 +747,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.stopRiding();
}
@@ -635,7 +635,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
// Pufferfish start - copied from this.guardEntityTick
try {
this.tickNonPassenger(entity); // Pufferfish - changed
@@ -760,22 +760,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -762,22 +762,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
}
// Pufferfish end
@@ -663,7 +663,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
}
@Override
@@ -857,9 +857,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -859,9 +859,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
boolean flag = this.isRaining();
int j = chunkcoordintpair.getMinBlockX();
int k = chunkcoordintpair.getMinBlockZ();
@@ -675,7 +675,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
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
@@ -891,7 +891,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -893,7 +893,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
@@ -684,7 +684,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
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);
@@ -927,7 +927,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -929,7 +929,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper start - optimise random block ticking
@@ -693,7 +693,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
//timings.chunkTicksBlocks.startTiming(); // Paper // Purpur
if (randomTickSpeed > 0) {
LevelChunkSection[] sections = chunk.getSections();
@@ -963,7 +963,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -965,7 +965,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper end - optimise random block ticking
//timings.chunkTicksBlocks.stopTiming(); // Paper // Purpur
@@ -702,7 +702,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
}
public Optional<BlockPos> findLightningRod(BlockPos pos) {
@@ -1259,19 +1259,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1261,19 +1261,19 @@ public class ServerLevel extends Level implements WorldGenLevel {
//try { // Purpur
// Paper end - timings
entity.setOldPosAndRot();
@@ -727,7 +727,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
//} finally { timer.stopTiming(); } // Paper - timings // Purpur
Iterator iterator = entity.getPassengers().iterator();
@@ -1300,12 +1300,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1302,12 +1302,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -744,7 +744,7 @@ index 725621bce1b82f44cea1247d1238644726ac3a2f..571a1cbee376032b6b9f36c9fe3f9199
// Paper start - EAR 2
if (isActive) {
passenger.rideTick();
@@ -1317,7 +1317,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1319,7 +1319,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
vehicle.positionRider(passenger);
}
// Paper end - EAR 2
@@ -1443,7 +1443,7 @@ index 288c6627906d07c0d223eacd84ae4eb31a349998..9babe636176da3c40598eb5bdac0919a
this.seen.add(i);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index c960aac9e1dbffe5e765f9adcfacc1966dc29148..c233533fdacb4f5e635267b5fc9fe21bc8b3c51a 100644
index 28633838cb314ba59b4ff3bbdb99343d98ee66ae..499a6b84f0db4a7ad881224f445558feae4f893f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -266,13 +266,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@@ -1768,7 +1768,7 @@ index c1541119630315521e75c1ba70ac99cd866afd71..b82541194979094f90b929cfdfb2b4c1
// Paper start
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 86e0539e04e4fe6239c1cb4c4055927303655251..620173eef4c2f30a97a4c2f8049ea01fcc60d0b2 100644
index 994ef28e4ad685405a2b045e29550563b0914ccc..4672b4dad9a7bfeda4ddf6c5938afd52d0310884 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -1292,9 +1292,9 @@ public class LevelChunk extends ChunkAccess {