2014-06-29 20:33:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Tue, 1 Mar 2016 13:14:11 -0600
|
2014-06-29 20:33:49 +02:00
|
|
|
Subject: [PATCH] Configurable fishing time ranges
|
|
|
|
|
|
|
|
|
2016-03-01 00:09:49 +01:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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
|
|
|
|
@@ -0,0 +0,0 @@ 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");
|
|
|
|
+ }
|
|
|
|
}
|
2014-06-29 20:33:49 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
2014-06-29 20:33:49 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
|
|
@@ -0,0 +0,0 @@ public class EntityFishingHook extends Entity {
|
2019-12-11 01:56:03 +01:00
|
|
|
this.aq = MathHelper.nextInt(this.random, 20, 80);
|
2016-11-17 03:23:38 +01:00
|
|
|
}
|
|
|
|
} else {
|
2019-12-11 01:56:03 +01:00
|
|
|
- this.ap = MathHelper.nextInt(this.random, 100, 600);
|
|
|
|
+ this.ap = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
|
|
|
|
this.ap -= this.au * 20 * 5;
|
|
|
|
+ this.ap = Math.max(0, this.ap); // Paper - Don't allow negative values
|
2016-11-17 03:23:38 +01:00
|
|
|
}
|
|
|
|
}
|
2019-04-05 06:09:29 +02:00
|
|
|
|