39 lines
1.9 KiB
Diff
39 lines
1.9 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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 796c17e0941922a9716212c6eae91643d8360418..78948c42b13194005bdbbbc69c2b7ae0732a78c5 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -89,4 +89,12 @@ public class PaperWorldConfig {
|
||
|
|
|
||
|
|
log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public int fishingMinTicks;
|
||
|
|
+ public int fishingMaxTicks;
|
||
|
|
+ private void fishingTickRange() {
|
||
|
|
+ fishingMinTicks = getInt("fishing-time-range.MinimumTicks", 100);
|
||
|
|
+ fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
|
||
|
|
+ log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
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 d74dae6d7bd78c082b39a4e38da640a57c40b341..2f67c2065ef29f17f12190b25bd1ea53e1fb55b4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
||
|
|
@@ -82,6 +82,10 @@ public class FishingHook extends Projectile {
|
||
|
|
owner.fishing = this;
|
||
|
|
this.luck = Math.max(0, lureLevel);
|
||
|
|
this.lureSpeed = Math.max(0, luckOfTheSeaLevel);
|
||
|
|
+ // Paper start
|
||
|
|
+ minWaitTime = world.paperConfig.fishingMinTicks;
|
||
|
|
+ maxWaitTime = world.paperConfig.fishingMaxTicks;
|
||
|
|
+ // paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
public FishingHook(net.minecraft.world.entity.player.Player thrower, Level world, int lureLevel, int luckOfTheSeaLevel) {
|