Skip to content

Commit 88d1824

Browse files
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0bd2eca0 [ci/skip] Clarify AsyncPlayerPreLoginEvent is post authentication (#13519) PaperMC/Paper@e7445e16 Prevent ticking virtual world borders multiple times per server tick (#13513) PaperMC/Paper@c3b18bdf Fix tracking depth in Scope (#13538) PaperMC/Paper@fc1d2c42 Check spawn_mobs gamerule for spawnEnemies flag (#13510) PaperMC/Paper@3bf1cb81 Add LEGACY_BARRIER to isTransparent (#13515) PaperMC/Paper@290414e7 Fix legacy conversion for maxDurability / data (#13529) PaperMC/Paper@b5e72578 Remove hard-coded max stack sizes from Material (#13518)
1 parent d0b1b32 commit 88d1824

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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 = a0f626b55215dfb4d3b1e9763901bdeee9184e48
6+
paperCommit = b5e7257841b4182a5a53fc7aeecff009301e0bfb
77

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

purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/Material.java
22
+++ b/src/main/java/org/bukkit/Material.java
3-
@@ -3708,4 +_,40 @@
3+
@@ -3703,4 +_,40 @@
44
return this.asItemType().getDefaultDataTypes();
55
}
66
// Paper end - data component API

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
+ org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur - Purpur config files
2929
for (ServerLevel world : this.console.getAllLevels()) {
3030
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
31-
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().get(GameRules.SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
31+
world.setSpawnSettings(world.isSpawningMonsters()); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
3232
@@ -1007,6 +_,7 @@
3333
}
3434
}

0 commit comments

Comments
 (0)