diff --git a/build.gradle.kts b/build.gradle.kts index 6c0ab3ec38..cd8843373a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.18.1+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.18.1+build.14:mergedv2") remapper("net.fabricmc:tiny-remapper:0.7.0:fat") decompiler("net.minecraftforge:forgeflower:1.5.498.22") paperclip("io.papermc:paperclip:3.0.2") diff --git a/patches/server/0015-Configurable-fishing-time-ranges.patch b/patches/server/0015-Configurable-fishing-time-ranges.patch index 4e33727123..d1e62948ab 100644 --- a/patches/server/0015-Configurable-fishing-time-ranges.patch +++ b/patches/server/0015-Configurable-fishing-time-ranges.patch @@ -22,13 +22,13 @@ index ec3fb557fa31b153de20c4990066182a774dd489..5896b4e4646d722db5622a424fa26f42 + } } diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 7a44f701c94878618963868bf63f4d6391842851..eaa3ed52a57b56fc0f260aadfd23c2fd6dfc0f51 100644 +index 73c5a0e6f1db6bf438fe516e213f40f0645ed954..dc248a0a91795fb67cc0e15cb0012364e739fbaa 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -82,6 +82,10 @@ public class FishingHook extends Projectile { this.noCulling = true; - this.luck = Math.max(0, lureLevel); - this.lureSpeed = Math.max(0, luckOfTheSeaLevel); + this.luck = Math.max(0, luckOfTheSeaLevel); + this.lureSpeed = Math.max(0, lureLevel); + // Paper start + minWaitTime = world.paperConfig.fishingMinTicks; + maxWaitTime = world.paperConfig.fishingMaxTicks;