mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecf
SPIGOT-5035: Error Using Virtual Merchant GUI0fc6922b
SPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44
SPIGOT-5024: Fox error - Unknown target reason
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
From d47f4c0dfb58af4d67bc6014f3b2348f89b71e55 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 55d8e74f82..a55163a458 100644
|
|
--- 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 {
|
|
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 cdcad4c292..19a6233c3f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
|
@@ -329,8 +329,9 @@ public class EntityFishingHook extends Entity {
|
|
this.at = MathHelper.nextInt(this.random, 20, 80);
|
|
}
|
|
} else {
|
|
- this.as = MathHelper.nextInt(this.random, 100, 600);
|
|
+ this.as = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
|
|
this.as -= this.ax * 20 * 5;
|
|
+ this.as = Math.max(0, this.as); // Paper - Don't allow negative values
|
|
}
|
|
}
|
|
|
|
--
|
|
2.21.0
|
|
|