From 30e83fff8a5106d5c4e05f848bc4f23ef005baba Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 2 Jan 2022 22:24:33 -0800 Subject: [PATCH] Fixed FishingHook param mappings being swapped (#7243) --- build.gradle.kts | 2 +- patches/server/Configurable-fishing-time-ranges.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/Configurable-fishing-time-ranges.patch b/patches/server/Configurable-fishing-time-ranges.patch index 0afcaef990..7b0a7599ea 100644 --- a/patches/server/Configurable-fishing-time-ranges.patch +++ b/patches/server/Configurable-fishing-time-ranges.patch @@ -27,8 +27,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -0,0 +0,0 @@ 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;