2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-03-01 00:09:49 +01:00
|
|
|
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
|
2020-11-12 02:48:12 +01:00
|
|
|
index 796c17e0941922a9716212c6eae91643d8360418..78948c42b13194005bdbbbc69c2b7ae0732a78c5 100644
|
2016-03-01 00:09:49 +01:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-11-12 02:48:12 +01:00
|
|
|
@@ -89,4 +89,12 @@ public class PaperWorldConfig {
|
2019-10-27 00:55:58 +02:00
|
|
|
|
|
|
|
log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
|
2016-03-01 00:09:49 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int fishingMinTicks;
|
|
|
|
+ public int fishingMaxTicks;
|
|
|
|
+ private void fishingTickRange() {
|
|
|
|
+ fishingMinTicks = getInt("fishing-time-range.MinimumTicks", 100);
|
2016-11-17 03:23:38 +01:00
|
|
|
+ fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
|
2016-03-01 00:09:49 +01:00
|
|
|
+ log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
|
|
|
|
+ }
|
|
|
|
}
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
|
|
|
|
index 2b75eab985b0f39e1624e5f4cab7e5b5bde6ae14..bcc411107d531529dbce9d1d43896a3c70e63012 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
|
|
|
|
@@ -85,6 +85,10 @@ public class EntityFishingHook extends IProjectile {
|
2020-11-07 01:19:04 +01:00
|
|
|
entityhuman.hookedFish = this;
|
|
|
|
this.an = Math.max(0, i);
|
2021-01-16 03:18:08 +01:00
|
|
|
this.lureLevel = Math.max(0, j);
|
2020-11-07 01:19:04 +01:00
|
|
|
+ // Paper start
|
|
|
|
+ minWaitTime = world.paperConfig.fishingMinTicks;
|
|
|
|
+ maxWaitTime = world.paperConfig.fishingMaxTicks;
|
|
|
|
+ // paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
public EntityFishingHook(EntityHuman entityhuman, World world, int i, int j) {
|