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

Refactoring the oopsies

Browse Source
This commit is contained in:
nossr50
2019-02-16 16:11:55 -08:00
parent 9731b9cffb
commit acf2bf362f
17 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
View File

@@ -30,8 +30,8 @@ public final class Fishing {
* @return possibleDrops List of ItemStack that can be dropped
*/
protected static List<ShakeTreasure> findPossibleDrops(LivingEntity target) {
if (TreasureMainConfig.getInstance().shakeMap.containsKey(target.getType()))
return TreasureMainConfig.getInstance().shakeMap.get(target.getType());
if (TreasureConfig.getInstance().shakeMap.containsKey(target.getType()))
return TreasureConfig.getInstance().shakeMap.get(target.getType());
return null;
}

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

@@ -367,7 +367,7 @@ public class FishingManager extends SkillManager {
break;
case BEDROCK:
if (TreasureMainConfig.getInstance().getInventoryStealEnabled()) {
if (TreasureConfig.getInstance().getInventoryStealEnabled()) {
PlayerInventory inventory = targetPlayer.getInventory();
int length = inventory.getContents().length;
int slot = Misc.getRandom().nextInt(length);
@@ -377,7 +377,7 @@ public class FishingManager extends SkillManager {
break;
}
if (TreasureMainConfig.getInstance().getInventoryStealStacks()) {
if (TreasureConfig.getInstance().getInventoryStealStacks()) {
inventory.setItem(slot, null);
}
else {
@@ -445,7 +445,7 @@ public class FishingManager extends SkillManager {
FishingTreasure treasure = null;
for (Rarity rarity : Rarity.values()) {
double dropRate = TreasureMainConfig.getInstance().getItemDropRate(getLootTier(), rarity);
double dropRate = TreasureConfig.getInstance().getItemDropRate(getLootTier(), rarity);
if (diceRoll <= dropRate) {
/*if (rarity == Rarity.TRAP) {
@@ -453,7 +453,7 @@ public class FishingManager extends SkillManager {
break;
}*/
List<FishingTreasure> fishingTreasures = TreasureMainConfig.getInstance().fishingRewards.get(rarity);
List<FishingTreasure> fishingTreasures = TreasureConfig.getInstance().fishingRewards.get(rarity);
if (fishingTreasures.isEmpty()) {
return null;
@@ -504,7 +504,7 @@ public class FishingManager extends SkillManager {
continue;
}
double dropRate = TreasureMainConfig.getInstance().getEnchantmentDropRate(getLootTier(), rarity);
double dropRate = TreasureConfig.getInstance().getEnchantmentDropRate(getLootTier(), rarity);
if (diceRoll <= dropRate) {
// Make sure enchanted books always get some kind of enchantment. --hoorigan
@@ -512,7 +512,7 @@ public class FishingManager extends SkillManager {
diceRoll = dropRate + 1;
continue;
}
fishingEnchantments = TreasureMainConfig.getInstance().fishingEnchantments.get(rarity);
fishingEnchantments = TreasureConfig.getInstance().fishingEnchantments.get(rarity);
break;
}