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

Removing traps from fishing command

Browse Source
This commit is contained in:
nossr50
2019-01-27 20:27:48 -08:00
parent 67a57f7472
commit b2b623505d
7 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
View File

@ -58,7 +58,6 @@ public class FishingCommand extends SkillCommand {
lootTier = fishingManager.getLootTier();
// Item drop rates
trapTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.TRAP) / 100.0);
commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
@ -70,7 +69,7 @@ public class FishingCommand extends SkillCommand {
double totalEnchantChance = 0;
for (Rarity rarity : Rarity.values()) {
if (rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
if (rarity != Rarity.RECORD) {
totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
}
}
@ -78,7 +77,7 @@ public class FishingCommand extends SkillCommand {
if(totalEnchantChance > 0)
magicChance = percent.format(totalEnchantChance / 100.0);
else
magicChance = percent.format(magicChance);
magicChance = percent.format(0);
}
// FISHING_SHAKE
@ -153,7 +152,6 @@ public class FishingCommand extends SkillCommand {
if (canTreasureHunt) {
messages.add(getStatMessage(false, true, SubSkillType.FISHING_TREASURE_HUNTER, String.valueOf(lootTier), String.valueOf(RankUtils.getHighestRank(SubSkillType.FISHING_TREASURE_HUNTER))));
messages.add(getStatMessage(true, true, SubSkillType.FISHING_TREASURE_HUNTER,
String.valueOf(trapTreasure),
String.valueOf(commonTreasure),
String.valueOf(uncommonTreasure),
String.valueOf(rareTreasure),

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

@ -58,7 +58,7 @@ public class TreasureConfig extends ConfigLoader {
double enchantDropRate = config.getDouble("Enchantment_Drop_Rates." + tier + "." + rarity.toString());
double itemDropRate = config.getDouble("Item_Drop_Rates." + tier + "." + rarity.toString());
if ((enchantDropRate < 0.0 || enchantDropRate > 100.0) && rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
if ((enchantDropRate < 0.0 || enchantDropRate > 100.0) && rarity != Rarity.RECORD) {
reason.add("The enchant drop rate for " + tier + " items that are " + rarity.toString() + "should be between 0.0 and 100.0!");
}
@ -311,7 +311,7 @@ public class TreasureConfig extends ConfigLoader {
private void loadEnchantments() {
for (Rarity rarity : Rarity.values()) {
if (rarity == Rarity.TRAP || rarity == Rarity.RECORD) {
if (rarity == Rarity.RECORD) {
continue;
}

3
src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java
View File

@ -6,8 +6,7 @@ public enum Rarity {
EPIC,
RARE,
UNCOMMON,
COMMON,
TRAP;
COMMON;
public static Rarity getRarity(String string) {
try {

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

@ -67,7 +67,7 @@ public class FishingManager extends SkillManager {
long currentTime = System.currentTimeMillis();
boolean hasFished = (currentTime < fishingTimestamp + (FISHING_COOLDOWN_SECONDS * 10));
if(hasFished == true)
if(hasFished)
fishingTimestamp = currentTime;
Location targetLocation = targetBlock.getLocation();
@ -421,7 +421,7 @@ public class FishingManager extends SkillManager {
double diceRoll = Misc.getRandom().nextDouble() * 100;
for (Rarity rarity : Rarity.values()) {
if (rarity == Rarity.TRAP || rarity == Rarity.RECORD) {
if (rarity == Rarity.RECORD) {
continue;
}

1
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
View File

@ -6,7 +6,6 @@ import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import com.gmail.nossr50.datatypes.skills.SubSkillType;
import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillRandomCheckEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.SkillManager;