39 Zeilen
1.9 KiB
Diff
39 Zeilen
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/EntityFishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
|
||
|
|
index 382b40a2a030993e1e98f34bc91befdd45c16895..7402e3b305d9bb7b27b97ff2078c26dd578232a1 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 {
|
||
|
|
entityhuman.hookedFish = this;
|
||
|
|
this.an = Math.max(0, i);
|
||
|
|
this.lureLevel = 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) {
|