Updated Upstream (Paper)

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

View File

@@ -762,10 +762,10 @@ index 9c2d62feff1816f5729060c6192269a5b2d34153..1e3349690d00c7889a381f7c65a3b5bf
}
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 2d4586859bd19a5094619d8abd62e466b822d293..ad9f63e80975b816f71e12f3801ba9e10c1c0cff 100644
index e2ea90469352346b43f0a86746179a6adc53d82a..ef2f9ee9f32d6a6ad7ec9385335fc368f0ecff32 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -804,7 +804,7 @@ public class LevelChunk extends ChunkAccess {
@@ -800,7 +800,7 @@ public class LevelChunk extends ChunkAccess {
this.chunkHolder.getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system
if (this.needsDecoration) {
@@ -774,7 +774,7 @@ index 2d4586859bd19a5094619d8abd62e466b822d293..ad9f63e80975b816f71e12f3801ba9e1
this.needsDecoration = false;
java.util.Random random = new java.util.Random();
random.setSeed(this.level.getSeed());
@@ -824,7 +824,7 @@ public class LevelChunk extends ChunkAccess {
@@ -820,7 +820,7 @@ public class LevelChunk extends ChunkAccess {
}
}
server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
@@ -783,7 +783,7 @@ index 2d4586859bd19a5094619d8abd62e466b822d293..ad9f63e80975b816f71e12f3801ba9e1
}
}
}
@@ -1182,7 +1182,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1178,7 +1178,7 @@ public class LevelChunk extends ChunkAccess {
ProfilerFiller gameprofilerfiller = LevelChunk.this.level.getProfiler();
gameprofilerfiller.push(this::getType);
@@ -792,7 +792,7 @@ index 2d4586859bd19a5094619d8abd62e466b822d293..ad9f63e80975b816f71e12f3801ba9e1
BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
if (this.blockEntity.getType().isValid(iblockdata)) {
@@ -1204,7 +1204,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1200,7 +1200,7 @@ public class LevelChunk extends ChunkAccess {
// Paper end
// Spigot start
} finally {