39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
From d1e7170b9d3d73895ed986db6751a0897443c488 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 ae3d0e4..7b2b95d 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -92,4 +92,12 @@ public class PaperWorldConfig {
|
|
babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference
|
|
log("Baby zombies will move at the speed of " + babyZombieMovementSpeed);
|
|
}
|
|
+
|
|
+ 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/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
index 91702f2..e0475ce 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
@@ -380,7 +380,7 @@ public class EntityFishingHook extends Entity {
|
|
this.at = MathHelper.nextInt(this.random, 20, 80);
|
|
}
|
|
} else {
|
|
- this.h = MathHelper.nextInt(this.random, 100, 600);
|
|
+ this.h = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper - Configurable fishing time range
|
|
this.h -= EnchantmentManager.g(this.owner) * 20 * 5;
|
|
}
|
|
}
|
|
--
|
|
2.10.2
|
|
|