2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2016-02-29 23:09:49 +00: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-05-06 09:48:49 +00:00
|
|
|
index 912611cf1aeccf5a82a789aab07d76723d4357cc..7d9976ce6bf86e6fdfd0c7770104cee0db363a6d 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-10-26 22:55:58 +00:00
|
|
|
@@ -84,4 +84,12 @@ public class PaperWorldConfig {
|
|
|
|
|
|
|
|
log("Baby zombies will move at the speed of " + babyZombieMovementModifier);
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int fishingMinTicks;
|
|
|
|
+ public int fishingMaxTicks;
|
|
|
|
+ private void fishingTickRange() {
|
|
|
|
+ fishingMinTicks = getInt("fishing-time-range.MinimumTicks", 100);
|
2016-11-17 02:23:38 +00:00
|
|
|
+ fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600);
|
2016-02-29 23:09:49 +00:00
|
|
|
+ log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks");
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
2020-11-07 00:19:04 +00:00
|
|
|
index 7c152768afcb6259984120d97205601d74e15148..9db1c891b69d4fbe163b3272f22351f3d0b306d1 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
2020-11-07 00:19:04 +00:00
|
|
|
@@ -46,6 +46,10 @@ public class EntityFishingHook extends IProjectile {
|
|
|
|
entityhuman.hookedFish = this;
|
|
|
|
this.an = Math.max(0, i);
|
|
|
|
this.ao = Math.max(0, j);
|
|
|
|
+ // Paper start
|
|
|
|
+ minWaitTime = world.paperConfig.fishingMinTicks;
|
|
|
|
+ maxWaitTime = world.paperConfig.fishingMaxTicks;
|
|
|
|
+ // paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
public EntityFishingHook(EntityHuman entityhuman, World world, int i, int j) {
|