Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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@2f4281e Remove unused skyLightSources
PaperMC/Paper@00331d9 Fix mushrooms not generating in swamps
PaperMC/Paper@4b0bc74 Initialise default nibble arrays in ChunkAccess directly
This commit is contained in:
granny
2023-10-16 21:49:40 -07:00
parent 7aa6845805
commit 1524516e0a
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0267-Remove-Mojang-Profiler.patch
View File

@@ -1819,16 +1819,16 @@ index 1e3349690d00c7889a381f7c65a3b5bf3de2ac5b..524301e2438ee2938b59eb2b2e9fc4e0
// 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 ad9f63e80975b816f71e12f3801ba9e10c1c0cff..6e9b9028f4ea2ff6ecb9398e36a30d70890bdfc5 100644
index ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32..220e1dbf70e7d51ea69d964eb7e84f55aa5a32d7 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -461,11 +461,11 @@ public class LevelChunk extends ChunkAccess {
@@ -457,11 +457,11 @@ public class LevelChunk extends ChunkAccess {
if (LightEngine.hasDifferentLightProperties(this, blockposition, iblockdata1, iblockdata)) {
ProfilerFiller gameprofilerfiller = this.level.getProfiler();
- gameprofilerfiller.push("updateSkyLightSources");
+ //gameprofilerfiller.push("updateSkyLightSources"); // Purpur
this.skyLightSources.update(this, j, i, l);
// Paper - starlight - remove skyLightSources
- gameprofilerfiller.popPush("queueCheckLight");
+ //gameprofilerfiller.popPush("queueCheckLight"); // Purpur
this.level.getChunkSource().getLightEngine().checkBlock(blockposition);
@@ -1837,7 +1837,7 @@ index ad9f63e80975b816f71e12f3801ba9e10c1c0cff..6e9b9028f4ea2ff6ecb9398e36a30d70
}
boolean flag3 = iblockdata1.hasBlockEntity();
@@ -1179,9 +1179,9 @@ public class LevelChunk extends ChunkAccess {
@@ -1175,9 +1175,9 @@ public class LevelChunk extends ChunkAccess {
if (LevelChunk.this.isTicking(blockposition)) {
try {
@@ -1849,7 +1849,7 @@ index ad9f63e80975b816f71e12f3801ba9e10c1c0cff..6e9b9028f4ea2ff6ecb9398e36a30d70
//this.blockEntity.tickTimer.startTiming(); // Spigot // Purpur
BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
@@ -1193,7 +1193,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1189,7 +1189,7 @@ public class LevelChunk extends ChunkAccess {
LevelChunk.LOGGER.warn("Block entity {} @ {} state {} invalid for ticking:", new Object[]{LogUtils.defer(this::getType), LogUtils.defer(this::getPos), iblockdata});
}