Prioritize directly defined rewards over reward files

Prevents weird cases of blank reward files overriding rewards

Author: BenCodez

AdvancedCore/src/main/java/com/bencodez/advancedcore/api/rewards/RewardHandler.java

@@ -325,19 +325,6 @@ public Reward getReward(String reward) {
 		}
 		reward = reward.replace(" ", "_");
 
-		/*
-		 * if (rewardOptions != null) { String prefix = rewardOptions.getPrefix(); if
-		 * (prefix != null && !prefix.equals("")) { String str = reward; reward = prefix
-		 * + "_" + str; } String suffix = rewardOptions.getSuffix(); if (suffix != null
-		 * && !suffix.equals("")) { reward += "_" + suffix; } }
-		 */
-
-		for (Reward rewardFile : getRewards()) {
-			if (rewardFile.getName().equalsIgnoreCase(reward)) {
-				return rewardFile;
-			}
-		}
-
 		if (reward.equals("")) {
 			plugin.getLogger().warning("Tried to get any empty reward file name, renaming to EmptyName");
 			reward = "EmptyName";
@@ -362,6 +349,12 @@ public Reward getReward(String reward) {
 			}
 		}
 
+		for (Reward rewardFile : getRewards()) {
+			if (rewardFile.getName().equalsIgnoreCase(reward)) {
+				return rewardFile;
+			}
+		}
+
 		return new Reward(reward);
 	}