diff --git a/Changelog.txt b/Changelog.txt
index 7869c5487..22f314acf 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,10 @@
+Version 2.1.59
+ Raised the overfishing limit from 3 to 10
+ Improved the overfishing messages to be more clear about its mechanics
+ Overfishing locale keys renamed "Fishing.ScarcityTip" and "Fishing.LowResourcesTip"
+
+ NOTES: This and other exploit prevention measures are much more customizable in 2.2, which shouldn't be too far off.
+
Version 2.1.58
Fixed the wrong locale string being used for Mining Double Drops
diff --git a/pom.xml b/pom.xml
index 1941eda3c..5bff90229 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
com.gmail.nossr50.mcMMO
mcMMO
- 2.1.58
+ 2.1.59
mcMMO
https://github.com/mcMMO-Dev/mcMMO
diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index 36c099ced..7f8c447ad 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -385,7 +385,7 @@ public class PlayerListener implements Listener {
{
if(fishingManager.isExploitingFishing(event.getHook().getLocation().toVector()))
{
- player.sendMessage(LocaleLoader.getString("Fishing.Scarcity"));
+ player.sendMessage(LocaleLoader.getString("Fishing.ScarcityTip", 3));
event.setExpToDrop(0);
Item caughtItem = (Item) caught;
caughtItem.remove();
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index 17385ad62..11c1040b8 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -44,7 +44,7 @@ import java.util.*;
public class FishingManager extends SkillManager {
public static final int FISHING_ROD_CAST_CD_MILLISECONDS = 100;
- public static final int OVERFISH_LIMIT = 4;
+ public static final int OVERFISH_LIMIT = 10;
private final long FISHING_COOLDOWN_SECONDS = 1000L;
private long fishingRodCastTimestamp = 0L;
@@ -139,7 +139,7 @@ public class FishingManager extends SkillManager {
if(fishCaughtCounter + 1 == OVERFISH_LIMIT)
{
- getPlayer().sendMessage(LocaleLoader.getString("Fishing.LowResources"));
+ getPlayer().sendMessage(LocaleLoader.getString("Fishing.LowResourcesTip", 3));
}
//If the new bounding box does not intersect with the old one, then update our bounding box reference
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index c4d6876e7..1ee3c2e54 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -223,10 +223,10 @@ Excavation.Skills.GigaDrillBreaker.Refresh=[[GREEN]]Your [[YELLOW]]Giga Drill Br
Excavation.Skills.GigaDrillBreaker.Other.Off=Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
Excavation.Skills.GigaDrillBreaker.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Giga Drill Breaker!
#FISHING
-Fishing.Scarcity=[[YELLOW]]&oThis area is suffering from overfishing, try fishing in a new area.
+Fishing.ScarcityTip=[[YELLOW]]&oThis area is suffering from overfishing, cast your rod in a different spot for more fish. At least {0} blocks away.
Fishing.Scared=[[GRAY]]&oChaotic movements will scare fish!
Fishing.Exhausting=[[RED]]&oImproper use of the fishing rod will cause fatigue and wear out the rod!
-Fishing.LowResources=[[GRAY]]You sense that there might not be many fish left in this area.
+Fishing.LowResourcesTip=[[GRAY]]You sense that there might not be many fish left in this area. Try fishing at least {0} blocks away.
Fishing.Ability.Info=Magic Hunter: [[GRAY]] **Improves With Treasure Hunter Rank**
Fishing.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (SHAKE)
Fishing.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (ICE FISHING)