PaperMC/patches/server/0030-Configurable-fishing-time-ranges.patch

31 lines
1.7 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
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
2024-06-13 19:12:48 +02:00
index 0acb45014039d4392988c7d853595f96e856af4a..ed43ad94ca007a54e3c32d5e17c141048eeb5835 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
2024-06-13 19:12:48 +02:00
@@ -94,6 +94,10 @@ public class FishingHook extends Projectile {
2021-06-12 00:37:16 +02:00
this.noCulling = true;
2024-06-13 19:12:48 +02:00
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
2021-06-11 14:02:28 +02:00
}
2021-06-12 00:37:16 +02:00
public FishingHook(EntityType<? extends FishingHook> type, Level world) {
2024-06-13 19:12:48 +02:00
@@ -411,7 +415,7 @@ public class FishingHook extends Projectile {
2022-01-18 07:54:31 +01:00
} else {
// CraftBukkit start - logic to modify fishing wait time
this.timeUntilLured = Mth.nextInt(this.random, this.minWaitTime, this.maxWaitTime);
2024-06-13 19:12:48 +02:00
- 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
2022-01-18 07:54:31 +01:00
// CraftBukkit end
}
}