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

ACTUALLY fix issue with fishing enchantments. Also updated the

Browse Source 
changelog.
This commit is contained in:
GJ
2013-01-17 18:25:26 -05:00
parent c0b3a4e929
commit 0dfd2fe9ef
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -2,7 +2,6 @@ package com.gmail.nossr50.skills.gathering;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.bukkit.DyeColor;
import org.bukkit.Location;
@ -164,14 +163,18 @@ public class Fishing {
*/
if (Misc.getRandom().nextInt(randomChance) <= (lootTier * magicHunterMultiplier) && Permissions.fishingMagic(player)) {
for (Enchantment newEnchant : Enchantment.values()) {
boolean conflicts = false;
if (newEnchant.canEnchantItem(fishingResults)) {
Map<Enchantment, Integer> resultEnchantments = fishingResults.getEnchantments();
specificChance++;
for (Enchantment oldEnchant : resultEnchantments.keySet()) {
if (oldEnchant.conflictsWith(newEnchant))
for (Enchantment oldEnchant : fishingResults.getEnchantments().keySet()) {
conflicts = oldEnchant.conflictsWith(newEnchant);
if (conflicts) {
specificChance--;
continue;
break;
}
}
/* CHANCE OF GETTING EACH ENCHANTMENT
@ -184,7 +187,7 @@ public class Fishing {
* 12.5% - 7th Enchantment
* 11.11% - 8th Enchantment
*/
if (Misc.getRandom().nextInt(specificChance) < 1) {
if (!conflicts && Misc.getRandom().nextInt(specificChance) < 1) {
enchanted = true;
int randomEnchantLevel = Misc.getRandom().nextInt(newEnchant.getMaxLevel()) + 1;