Skip to content

Commit f3fa961

Browse files
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@173bd93 [ci skip] Rebuild patches PaperMC/Paper@a47cb98 Add check for null player name in Team methods (#13468) PaperMC/Paper@ebf5086 Expand wateranimal-spawn-height config for nautilus (#13488) PaperMC/Paper@179626d Fix a few inverted checks for skulls (#13502) PaperMC/Paper@5fa4be9 feature: expose mannequin poses (#13429) PaperMC/Paper@1fd9d08 Fix backward compat for World#setPVP (#13503) PaperMC/Paper@350fd5e Prevent negative anger level for neutral mobs (#13504) PaperMC/Paper@575df56 Add zip error reporting to PaperPluginClassLoader (#13505) PaperMC/Paper@51239f4 Fix usage message on spigot reload command (#13494) PaperMC/Paper@ede8d0d Format paper-api mob goals in debug renderer (#13495) PaperMC/Paper@444a2ba Change thrown trident item to use copy of ItemStack of count 1 (#13394) PaperMC/Paper@93e81bf Add support for loading plugins from extra directories (#13447) PaperMC/Paper@5be5b38 Make merchant accessible in PlayerPurchaseEvent (#13062) PaperMC/Paper@8556cb4 Clamp negative site api distances in the version fetcher to avoid caching issues (#13506) PaperMC/Paper@b3edd3f Clamp respawn location pitch to correct bounds (#13509) PaperMC/Paper@4b35f5c Fix using experience bottle does not award item used stat (#13522) PaperMC/Paper@a0f626b Fix backward compat for EnchantmentTarget.WEAPON (#13508) PaperMC/Paper@0bd2eca [ci skip] Clarify AsyncPlayerPreLoginEvent is post authentication (#13519) PaperMC/Paper@e7445e1 Prevent ticking virtual world borders multiple times per server tick (#13513) PaperMC/Paper@c3b18bd Fix tracking depth in Scope (#13538) PaperMC/Paper@fc1d2c4 Check spawn_mobs gamerule for spawnEnemies flag (#13510) PaperMC/Paper@3bf1cb8 Add LEGACY_BARRIER to isTransparent (#13515) PaperMC/Paper@290414e Fix legacy conversion for maxDurability / data (#13529) PaperMC/Paper@b5e7257 Remove hard-coded max stack sizes from Material (#13518) PaperMC/Paper@8a6654c Redirect attacks with piercing weapon PaperMC/Paper@81b9122 Fix PlayerClientLoadedWorldEvent#isTimeout being always true (#13573) PaperMC/Paper@4873e3f Fix Bee anger never gets timeout (#13546) PaperMC/Paper@57c7aac Propagate failures from suggestion futures fixes #13587 (#13598) PaperMC/Paper@fd39dbd Provide locale pointer for config connection audience (#13600) PaperMC/Paper@a687a82 [ci skip] chore: remove unneeded task configuration (#13484) PaperMC/Paper@e5718dc fix: PlayerServerFullCheckEvent#deny not setting the allow flag (#13601) PaperMC/Paper@ae0c3a9 Add ItemCraftedEvent (#12245) PaperMC/Paper@581214a Fix fixClimbingBypassingCramming option (#12793) PaperMC/Paper@0d768aa Add RecipeChoice.ItemTypeChoice (#12049) PaperMC/Paper@e2b76df Implement deprecated getItemStack method in ItemTypeRecipeChoice (#13607) PaperMC/Paper@9d30329 Fix pre-tick cooldown reset on swap (#13589) PaperMC/Paper@04739de Make SkinSource Player implementation reflect profile changes (#13585) PaperMC/Paper@c59990d Update affects spawning api (#13556)
1 parent 338afe3 commit f3fa961

File tree

5 files changed

+6
-6
lines changed

5 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
mcVersion=1.21.11
44
apiVersion=1.21.11
55

6-
paperRef=3ebc5b3320924e9122903dfd1f11abcf897300e6
6+
paperRef=c59990d92d87f3b8ab6339918c70dd98c9e14002
77

88
org.gradle.jvmargs=-Xmx2G
99
org.gradle.vfs.watch=false

sakura-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
@@ -7,7 +7,7 @@
77
+ this.console.sakuraConfigurations.reloadConfigs(this.console); // Sakura - sakura configuration files; missing comment above :<
88
for (ServerLevel world : this.console.getAllLevels()) {
99
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
10-
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().get(GameRules.SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
10+
world.setSpawnSettings(world.isSpawningMonsters()); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
1111
@@ -1023,6 +_,7 @@
1212
this.reloadData();
1313
org.spigotmc.SpigotConfig.registerCommands(); // Spigot

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.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/craftbukkit/CraftWorld.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
3-
@@ -295,6 +_,12 @@
3+
@@ -292,6 +_,12 @@
44
).isValid();
55
}
66
// Paper end

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
3-
@@ -162,6 +_,14 @@
3+
@@ -169,6 +_,14 @@
44
.defaultsTo(new File[] {})
5-
.describedAs("Jar file");
5+
.describedAs("Plugin directory");
66

77
+ // Sakura start - sakura configuration files
88
+ acceptsAll(asList("sakura-dir", "sakura-settings-directory"), "Directory for Sakura settings")

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.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/craftbukkit/entity/CraftPlayer.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
3-
@@ -254,6 +_,18 @@
3+
@@ -252,6 +_,18 @@
44
this.firstPlayed = System.currentTimeMillis();
55
}
66

0 commit comments

Comments
 (0)