testserver/Spigot-Server-Patches/0019-Configurable-fishing-t...

41 lines
2.0 KiB
Diff
Raw Normal View History

2014-08-05 23:45:22 +00:00
From 117d035fae9747b3caa7d77448cebb4f1828bb8d Mon Sep 17 00:00:00 2001
2014-06-29 18:33:49 +00:00
From: Zach Brown <Zbob750@live.com>
2014-08-05 23:45:22 +00:00
Date: Tue, 5 Aug 2014 17:49:02 -0500
2014-06-29 18:33:49 +00:00
Subject: [PATCH] Configurable fishing time ranges
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
2014-08-05 23:45:22 +00:00
index 197dca1..7d0fda6 100644
2014-06-29 18:33:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
2014-08-05 23:45:22 +00:00
@@ -315,7 +315,8 @@ public class EntityFishingHook extends Entity {
2014-06-29 18:33:49 +00:00
this.az = MathHelper.nextInt(this.random, 20, 80);
}
} else {
- this.ay = MathHelper.nextInt(this.random, 100, 900);
2014-08-05 23:45:22 +00:00
+ // PaperSpigot - Configurable fishing tick range
+ this.ay = MathHelper.nextInt(this.random, this.world.paperSpigotConfig.fishingMinTicks, this.world.paperSpigotConfig.fishingMaxTicks);
2014-06-29 18:33:49 +00:00
this.ay -= EnchantmentManager.getLureEnchantmentLevel(this.owner) * 20 * 5;
}
}
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2014-08-05 23:45:22 +00:00
index 9cd9c6d..1d01f89 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
2014-08-05 23:45:22 +00:00
@@ -113,4 +113,12 @@ public class PaperSpigotWorldConfig
invertedDaylightDetectors = getBoolean( "inverted-daylight-detectors", false );
log( "Inverted Redstone Lamps: " + invertedDaylightDetectors );
2014-06-29 18:33:49 +00:00
}
+
2014-08-05 23:45:22 +00:00
+ public int fishingMinTicks;
+ public int fishingMaxTicks;
+ private void fishingTickRange()
2014-06-29 18:33:49 +00:00
+ {
2014-08-05 23:45:22 +00:00
+ fishingMinTicks = getInt( "fishing-time-range.MinimumTicks", 100 );
+ fishingMaxTicks = getInt( "fishing-time-range.MaximumTicks", 900 );
2014-06-29 18:33:49 +00:00
+ }
}
2014-06-29 18:33:49 +00:00
--
1.9.1