diff --git a/src/main/java/me/blackvein/quests/Quest.java b/src/main/java/me/blackvein/quests/Quest.java index 4fdc44c46..3b28dae6c 100644 --- a/src/main/java/me/blackvein/quests/Quest.java +++ b/src/main/java/me/blackvein/quests/Quest.java @@ -64,8 +64,6 @@ public class Quest { List commands = new LinkedList(); List permissions = new LinkedList(); LinkedList itemRewards = new LinkedList(); - LinkedList rpgItemRewardIDs = new LinkedList(); - LinkedList rpgItemRewardAmounts = new LinkedList(); List mcmmoSkills = new LinkedList(); List mcmmoAmounts = new LinkedList(); List heroesClasses = new LinkedList(); @@ -233,7 +231,7 @@ public class Quest { return false; } } else { - plugin.getLogger().warning("[Quests] Quester \"" + player.getName() + "\" attempted to take Quest \"" + name + "\", but the Custom Requirement \"" + s + "\" could not be found. Does it still exist?"); + plugin.getLogger().warning("Quester \"" + player.getName() + "\" attempted to take Quest \"" + name + "\", but the Custom Requirement \"" + s + "\" could not be found. Does it still exist?"); } } if (quester.questPoints < questPointsReq) { @@ -243,7 +241,6 @@ public class Quest { return false; } for (String q : blockQuests) { - // TODO make sure this works Quest questObject = new Quest(); questObject.name = q; if (quester.completedQuests.contains(q) || quester.currentQuests.containsKey(questObject)) { @@ -514,12 +511,6 @@ public class Quest { if (other.itemRewards.equals(itemRewards) == false) { return false; } - if (other.rpgItemRewardIDs.equals(rpgItemRewardIDs) == false) { - return false; - } - if (other.rpgItemRewardAmounts.equals(rpgItemRewardAmounts) == false) { - return false; - } if (other.mcmmoAmounts.equals(mcmmoAmounts) == false) { return false; } @@ -645,8 +636,6 @@ public class Quest { hash = 53 * hash + (this.commands != null ? this.commands.hashCode() : 0); hash = 53 * hash + (this.permissions != null ? this.permissions.hashCode() : 0); hash = 53 * hash + (this.itemRewards != null ? this.itemRewards.hashCode() : 0); - hash = 53 * hash + (this.rpgItemRewardIDs != null ? this.rpgItemRewardIDs.hashCode() : 0); - hash = 53 * hash + (this.rpgItemRewardAmounts != null ? this.rpgItemRewardAmounts.hashCode() : 0); hash = 53 * hash + (this.mcmmoSkills != null ? this.mcmmoSkills.hashCode() : 0); hash = 53 * hash + (this.mcmmoAmounts != null ? this.mcmmoAmounts.hashCode() : 0); hash = 53 * hash + (this.heroesClasses != null ? this.heroesClasses.hashCode() : 0);