From 0050f4edf4ab85c8615da832034fa746e2a5e6ce Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 24 Oct 2021 19:38:23 +0200 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6823) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 58c2d3c7 SPIGOT-6771: Help command tab completion does not respect permissions CraftBukkit Changes: fd50041d SPIGOT-6768: Remove upper bound on setFreezeTicks Spigot Changes: 38929296 SPIGOT-6767: Configurable Thunder Chance --- patches/server/Disable-thunder.patch | 4 ++-- patches/server/Optimise-random-block-ticking.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/server/Disable-thunder.patch b/patches/server/Disable-thunder.patch index e5de8ace83..cad1755f62 100644 --- a/patches/server/Disable-thunder.patch +++ b/patches/server/Disable-thunder.patch @@ -26,8 +26,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 gameprofilerfiller.push("thunder"); BlockPos blockposition; -- if (flag && this.isThundering() && this.random.nextInt(100000) == 0) { -+ if (!this.paperConfig.disableThunder && flag && this.isThundering() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder +- if (flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot ++ if (!this.paperConfig.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15)); if (this.isRainingAt(blockposition)) { DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition); diff --git a/patches/server/Optimise-random-block-ticking.patch b/patches/server/Optimise-random-block-ticking.patch index 7c91370ebf..daaea5b65a 100644 --- a/patches/server/Optimise-random-block-ticking.patch +++ b/patches/server/Optimise-random-block-ticking.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - BlockPos blockposition; + final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change - if (!this.paperConfig.disableThunder && flag && this.isThundering() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder + if (!this.paperConfig.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder - blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15)); + blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper if (this.isRainingAt(blockposition)) { diff --git a/work/Bukkit b/work/Bukkit index e337669a52..58c2d3c7b8 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit e337669a5233c785af433eac628e25b117dde034 +Subproject commit 58c2d3c7b845e2db9476e5e76e4b7f7d376f05e8 diff --git a/work/CraftBukkit b/work/CraftBukkit index f0f801e58e..fd50041d32 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f0f801e58e1cef125052b1e8a4bc420ca7acff83 +Subproject commit fd50041d32495444c229c63a6adf691c93b135e1 diff --git a/work/Spigot b/work/Spigot index dc75aca853..38929296b0 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit dc75aca85361e65679880f2abd5c92f6db448ae2 +Subproject commit 38929296b008a62a7a8532c46550aa493e2246a8