mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
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)
This commit is contained in:
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
|
||||
|
||||
mcVersion = 1.21.11
|
||||
apiVersion = 1.21.11
|
||||
paperCommit = a0f626b55215dfb4d3b1e9763901bdeee9184e48
|
||||
paperCommit = b5e7257841b4182a5a53fc7aeecff009301e0bfb
|
||||
|
||||
org.gradle.configuration-cache = true
|
||||
org.gradle.caching = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/Material.java
|
||||
+++ b/src/main/java/org/bukkit/Material.java
|
||||
@@ -3708,4 +_,40 @@
|
||||
@@ -3703,4 +_,40 @@
|
||||
return this.asItemType().getDefaultDataTypes();
|
||||
}
|
||||
// Paper end - data component API
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
+ org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur - Purpur config files
|
||||
for (ServerLevel world : this.console.getAllLevels()) {
|
||||
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
|
||||
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().get(GameRules.SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
|
||||
world.setSpawnSettings(world.isSpawningMonsters()); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
|
||||
@@ -1007,6 +_,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user