mirror of https://github.com/PaperMC/Paper.git
31 lines
1.7 KiB
Diff
31 lines
1.7 KiB
Diff
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
|
|
index c9d619c61ed3ee3adb688d0f7d0878d25607a9a2..6b3cf71d7ced6405308b41ac316040bcc03f654d 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
@@ -93,6 +93,10 @@ public class FishingHook extends Projectile {
|
|
this.noCulling = true;
|
|
this.luck = Math.max(0, luckOfTheSeaLevel);
|
|
this.lureSpeed = Math.max(0, lureLevel);
|
|
+ // 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) {
|
|
@@ -410,7 +414,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 * 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
|
|
}
|
|
}
|