Paper/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch

40 lines
1.9 KiB
Diff
Raw Normal View History

From 12dd50f4836a33df93b0ab65175a5cdf1f842e90 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
index a3c0d9159..cacf58607 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
@@ -79,4 +79,12 @@ public class PaperWorldConfig {
2016-03-01 00:09:49 +01:00
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);
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");
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index a9bd59418..7c119282b 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -386,7 +386,7 @@ public class EntityFishingHook extends Entity {
this.aw = MathHelper.nextInt(this.random, 20, 80);
2016-11-17 03:23:38 +01:00
}
} else {
- this.h = MathHelper.nextInt(this.random, 100, 600);
2016-12-20 23:34:27 +01:00
+ this.h = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
this.h -= this.aA * 20 * 5;
2016-11-17 03:23:38 +01:00
}
}
2016-03-01 00:09:49 +01:00
--
2.18.0
2016-03-01 00:09:49 +01:00