浏览代码

Use new hasConflictingEnchant method.

GJ 12 年之前
父节点
当前提交
d4c8cc28a1
共有 1 个文件被更改,包括 1 次插入11 次删除
  1. 1 11
      src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

+ 1 - 11
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -263,17 +263,7 @@ public class FishingManager extends SkillManager {
         int specificChance = 1;
 
         for (Enchantment possibleEnchantment : possibleEnchantments) {
-            boolean conflicts = false;
-
-            for (Enchantment currentEnchantment : treasureDrop.getEnchantments().keySet()) {
-                conflicts = currentEnchantment.conflictsWith(possibleEnchantment);
-
-                if (conflicts) {
-                    break;
-                }
-            }
-
-            if (!conflicts && Misc.getRandom().nextInt(specificChance) == 0) {
+            if (!treasureDrop.getItemMeta().hasConflictingEnchant(possibleEnchantment) && Misc.getRandom().nextInt(specificChance) == 0) {
                 treasureDrop.addEnchantment(possibleEnchantment, Misc.getRandom().nextInt(possibleEnchantment.getMaxLevel()) + 1);
 
                 specificChance++;