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
|
2018-07-24 02:24:44 +02:00
|
|
|
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
|
|
|
|
@@ -0,0 +0,0 @@ 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);
|
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
|
2018-07-24 02:24:44 +02:00
|
|
|
index a9bd59418..7c119282b 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 {
|
2018-07-15 03:53:17 +02:00
|
|
|
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
|
2018-07-15 03:53:17 +02:00
|
|
|
this.h -= this.aA * 20 * 5;
|
2016-11-17 03:23:38 +01:00
|
|
|
}
|
|
|
|
}
|
2015-03-08 02:16:09 +01:00
|
|
|
--
|