Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bc0c3d88 Promote build channel to STABLE
PaperMC/Paper@e90c034f Finalize unpick migration (#13463)
PaperMC/Paper@94d0c97a Don't try to save scoreboard if there is no world loaded (#13471)
This commit is contained in:
granny
2025-12-30 17:46:17 -08:00
parent 29e98ecdba
commit 9f8e60206b
4 changed files with 6 additions and 6 deletions

View File

@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
mcVersion = 1.21.11
apiVersion=1.21.11
paperCommit = 5875d88002d9beeb8b0a3dc8af352777d32265c0
paperCommit = 94d0c97acd627866d24795d68d30d66a4b84974a
org.gradle.configuration-cache = true
org.gradle.caching = true

View File

@@ -139,11 +139,11 @@
+ // Purpur end - Smooth snow accumulation
BlockState blockState1 = blockState.setValue(SnowLayerBlock.LAYERS, layersValue + 1);
Block.pushEntitiesUp(blockState, blockState1, this, heightmapPos);
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, blockState1, 3, null); // CraftBukkit
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, blockState1, Block.UPDATE_ALL, null); // CraftBukkit
+ } // Purpur - Smooth snow accumulation
}
} else {
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), 3, null); // CraftBukkit
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), Block.UPDATE_ALL, null); // CraftBukkit
@@ -1070,7 +_,7 @@
poiType -> poiType.is(PoiTypes.LIGHTNING_ROD),
blockPos -> blockPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockPos.getX(), blockPos.getZ()) - 1,

View File

@@ -48,7 +48,7 @@
- if (!this.isSilent()) {
+ if (!this.isSilent() && level.purpurConfig.witherPlaySpawnSound) { // Purpur - Toggle for Wither's spawn sound
// CraftBukkit start - Use relative location for far away sounds
// level.globalLevelEvent(1023, this.blockPosition(), 0);
// level.globalLevelEvent(LevelEvent.SOUND_WITHER_BOSS_SPAWN, this.blockPosition(), 0);
int viewDistance = level.getCraftServer().getViewDistance() * 16;
@@ -379,8 +_,10 @@
}

View File

@@ -23,10 +23,10 @@
@@ -76,6 +_,10 @@
} else {
if (blockState.getBlock() instanceof LiquidBlock) {
blockList.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit
blockList.setBlock(blockPos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL); // CraftBukkit
+ // Purpur start - Option for sponges to work on lava and mud
+ } else if (blockState.is(Blocks.MUD)) {
+ blockList.setBlock(blockPos, Blocks.CLAY.defaultBlockState(), 3);
+ blockList.setBlock(blockPos, Blocks.CLAY.defaultBlockState(), Block.UPDATE_ALL);
+ // Purpur end - Option for sponges to work on lava and mud
} else {
if (!blockState.is(Blocks.KELP)