2021-06-11 12:02:28 +00: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
|
2022-06-09 08:51:45 +00:00
|
|
|
index 792d85ea46d392a27ac89c42e037dc90d33fad7f..00fe96650e4d973e97b46968297f55f4c3674629 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
2022-03-01 05:43:03 +00:00
|
|
|
@@ -85,6 +85,10 @@ public class FishingHook extends Projectile {
|
2021-06-11 22:37:16 +00:00
|
|
|
this.noCulling = true;
|
2022-01-03 06:24:33 +00:00
|
|
|
this.luck = Math.max(0, luckOfTheSeaLevel);
|
|
|
|
this.lureSpeed = Math.max(0, lureLevel);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ // Paper start
|
2022-06-09 08:51:45 +00:00
|
|
|
+ minWaitTime = world.paperConfig().fishingTimeRange.minimum;
|
|
|
|
+ maxWaitTime = world.paperConfig().fishingTimeRange.maximum;
|
2021-10-02 17:21:49 +00:00
|
|
|
+ // Paper end
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
2021-06-11 22:37:16 +00:00
|
|
|
public FishingHook(EntityType<? extends FishingHook> type, Level world) {
|
2022-03-01 05:43:03 +00:00
|
|
|
@@ -400,7 +404,7 @@ public class FishingHook extends Projectile {
|
2022-01-18 06:54:31 +00:00
|
|
|
} 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 * 20 * 5 : 0;
|
|
|
|
+ this.timeUntilLured -= (this.applyLure) ? (this.lureSpeed * 20 * 5 >= this.maxWaitTime ? this.timeUntilLured - 1 : this.lureSpeed * 20 * 5) : 0; // Paper - Fix Lure infinite loop
|
|
|
|
// CraftBukkit end
|
|
|
|
}
|
|
|
|
}
|