aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0029-Configurable-fishing-time-ranges.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0029-Configurable-fishing-time-ranges.patch')
-rw-r--r--patches/server/0029-Configurable-fishing-time-ranges.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/server/0029-Configurable-fishing-time-ranges.patch b/patches/server/0029-Configurable-fishing-time-ranges.patch
new file mode 100644
index 0000000000..90d886761f
--- /dev/null
+++ b/patches/server/0029-Configurable-fishing-time-ranges.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Tue, 1 Mar 2016 13:14:11 -0600
+Subject: [PATCH] Configurable fishing time ranges
+
+
+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 0acb45014039d4392988c7d853595f96e856af4a..ed43ad94ca007a54e3c32d5e17c141048eeb5835 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+@@ -94,6 +94,10 @@ public class FishingHook extends Projectile {
+ this.noCulling = true;
+ this.luck = Math.max(0, luckBonus);
+ this.lureSpeed = Math.max(0, waitTimeReductionTicks);
++ // Paper start - Configurable fishing time ranges
++ minWaitTime = world.paperConfig().fishingTimeRange.minimum;
++ maxWaitTime = world.paperConfig().fishingTimeRange.maximum;
++ // Paper end - Configurable fishing time ranges
+ }
+
+ public FishingHook(EntityType<? extends FishingHook> type, Level world) {
+@@ -411,7 +415,7 @@ public class FishingHook extends Projectile {
+ } else {
+ // CraftBukkit start - logic to modify fishing wait time
+ this.timeUntilLured = Mth.nextInt(this.random, this.minWaitTime, this.maxWaitTime);
+- this.timeUntilLured -= (this.applyLure) ? this.lureSpeed : 0;
++ this.timeUntilLured -= (this.applyLure) ? (this.lureSpeed >= this.maxWaitTime ? this.timeUntilLured - 1 : this.lureSpeed ) : 0; // Paper - Fix Lure infinite loop
+ // CraftBukkit end
+ }
+ }