EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 02:53:43 +01:00
Code Issues Projects Releases Wiki Activity

Fishing drops are no longer random amounts

Browse Source
This commit is contained in:
nossr50
2019-08-23 20:51:32 -06:00
parent 77ffee2515
commit 52f9273fa8
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.txt
View File

@@ -1,9 +1,14 @@
Version 2.1.103 Version 2.1.103
Treasure item amount will default to 1 if not specified instead of breaking mcMMO
Fishing treasures will now return the amount defined in treasures config file, an option to randomize amounts will be coming in the future. See notes.
Fixed a bug where Tree Feller was only rewarding 1 XP per log broken no matter the circumstances Fixed a bug where Tree Feller was only rewarding 1 XP per log broken no matter the circumstances
Fixed an issue with salvage checking the incorrect level requirement Fixed an issue with salvage checking the incorrect level requirement
Updated Italian locale (thanks Leomixer17) Updated Italian locale (thanks Leomixer17)
Fixed grammar in one of the Salvage strings (thanks QuantumToasted) Fixed grammar in one of the Salvage strings (thanks QuantumToasted)
NOTES:
Sometime in 2014 a decision was made that any fishing treasure over the amount of 1 will be randomized in its yield, while this is not necessarily a bad thing it means control over the drop is a bit random. I've removed this randomness temporarily, in the future you will be able to chose if the amount is randomized or static.
Version 2.1.102 Version 2.1.102
Scoreboards will now be removed from players who teleport to a blacklisted world Scoreboards will now be removed from players who teleport to a blacklisted world
Fixed a bug where Rupture could trigger itself Fixed a bug where Rupture could trigger itself

2
src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
View File

@@ -150,7 +150,7 @@ public class TreasureConfig extends ConfigLoader {
} }
if (amount <= 0) { if (amount <= 0) {
reason.add("Amount of " + treasureName + " must be greater than 0! " + amount); amount = 1;
} }
if (material != null && material.isBlock() && (data > 127 || data < -128)) { if (material != null && material.isBlock() && (data > 127 || data < -128)) {

5
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@@ -480,9 +480,10 @@ public class FishingManager extends SkillManager {
treasureDrop.setDurability((short) (Misc.getRandom().nextInt(maxDurability))); treasureDrop.setDurability((short) (Misc.getRandom().nextInt(maxDurability)));
} }
if (treasureDrop.getAmount() > 1) { //TODO: Add option to randomize the amount rewarded
/*if (treasureDrop.getAmount() > 1) {
treasureDrop.setAmount(Misc.getRandom().nextInt(treasureDrop.getAmount()) + 1); treasureDrop.setAmount(Misc.getRandom().nextInt(treasureDrop.getAmount()) + 1);
} }*/
treasure.setDrop(treasureDrop); treasure.setDrop(treasureDrop);