Skip to content

Commit 9f8e602

Browse files
committed
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)
1 parent 29e98ec commit 9f8e602

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.11
55
apiVersion=1.21.11
6-
paperCommit = 5875d88002d9beeb8b0a3dc8af352777d32265c0
6+
paperCommit = 94d0c97acd627866d24795d68d30d66a4b84974a
77

88
org.gradle.configuration-cache = true
99
org.gradle.caching = true

purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@
139139
+ // Purpur end - Smooth snow accumulation
140140
BlockState blockState1 = blockState.setValue(SnowLayerBlock.LAYERS, layersValue + 1);
141141
Block.pushEntitiesUp(blockState, blockState1, this, heightmapPos);
142-
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, blockState1, 3, null); // CraftBukkit
142+
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, blockState1, Block.UPDATE_ALL, null); // CraftBukkit
143143
+ } // Purpur - Smooth snow accumulation
144144
}
145145
} else {
146-
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), 3, null); // CraftBukkit
146+
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, heightmapPos, Blocks.SNOW.defaultBlockState(), Block.UPDATE_ALL, null); // CraftBukkit
147147
@@ -1070,7 +_,7 @@
148148
poiType -> poiType.is(PoiTypes.LIGHTNING_ROD),
149149
blockPos -> blockPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockPos.getX(), blockPos.getZ()) - 1,

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/boss/wither/WitherBoss.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
- if (!this.isSilent()) {
4949
+ if (!this.isSilent() && level.purpurConfig.witherPlaySpawnSound) { // Purpur - Toggle for Wither's spawn sound
5050
// CraftBukkit start - Use relative location for far away sounds
51-
// level.globalLevelEvent(1023, this.blockPosition(), 0);
51+
// level.globalLevelEvent(LevelEvent.SOUND_WITHER_BOSS_SPAWN, this.blockPosition(), 0);
5252
int viewDistance = level.getCraftServer().getViewDistance() * 16;
5353
@@ -379,8 +_,10 @@
5454
}

purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
@@ -76,6 +_,10 @@
2424
} else {
2525
if (blockState.getBlock() instanceof LiquidBlock) {
26-
blockList.setBlock(blockPos, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit
26+
blockList.setBlock(blockPos, Blocks.AIR.defaultBlockState(), Block.UPDATE_ALL); // CraftBukkit
2727
+ // Purpur start - Option for sponges to work on lava and mud
2828
+ } else if (blockState.is(Blocks.MUD)) {
29-
+ blockList.setBlock(blockPos, Blocks.CLAY.defaultBlockState(), 3);
29+
+ blockList.setBlock(blockPos, Blocks.CLAY.defaultBlockState(), Block.UPDATE_ALL);
3030
+ // Purpur end - Option for sponges to work on lava and mud
3131
} else {
3232
if (!blockState.is(Blocks.KELP)

0 commit comments

Comments
 (0)