Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-27 13:15:55 +01:00
Code Issues Projects Releases Wiki Activity

Use default sheep color if null, fixes #1205

Browse Source
This commit is contained in:
PikaMug 2020-04-16 23:48:42 -04:00
parent 8b90109bdc
commit 0559cf4a2d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -1008,7 +1008,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
ChatColor color = e2.getValue() < e.getValue() == false ? ChatColor.GREEN : ChatColor.GRAY; ChatColor color = e2.getValue() < e.getValue() == false ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + Lang.get(quester.getPlayer(), "shearSheep") String message = color + Lang.get(quester.getPlayer(), "shearSheep")
+ color + ": " + e2.getValue() + "/" + e.getValue(); + color + ": " + e2.getValue() + "/" + e.getValue();
message = message.replace("<color>", e.getKey().name().toLowerCase()); message = message.replace("<color>",
MiscUtil.getPrettyDyeColorName(MiscUtil.getProperDyeColor(e.getKey().name())));
quester.getPlayer().sendMessage(message); quester.getPlayer().sendMessage(message);
} }
} }
@ -2591,6 +2592,9 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
List<Integer> shearAmounts = config.getIntegerList("quests." + questKey + ".stages.ordered." List<Integer> shearAmounts = config.getIntegerList("quests." + questKey + ".stages.ordered."
+ stageNum + ".sheep-amounts"); + stageNum + ".sheep-amounts");
for (String color : sheep) { for (String color : sheep) {
if (color.equalsIgnoreCase("NULL")) {
color = "WHITE";
}
DyeColor dc = MiscUtil.getProperDyeColor(color); DyeColor dc = MiscUtil.getProperDyeColor(color);
try { try {
if (dc == null) { if (dc == null) {