Correct showing of location names for kill-mob objectives, fixes #1030

This commit is contained in:
PikaMug 2020-01-04 22:29:52 -05:00
parent 776e28cb0a
commit cd9acf0d2b

View File

@ -962,10 +962,11 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
+ (data.mobNumKilled.get(data.mobsKilled.indexOf(e2))) + (data.mobNumKilled.get(data.mobsKilled.indexOf(e2)))
+ "/" + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e))); + "/" + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e)));
} else { } else {
message = color + Lang.get(quester.getPlayer(), "killAtLocation") + " " message = color + Lang.get(quester.getPlayer(), "killAtLocation") + color + ": "
+ ChatColor.AQUA + "<mob>" + color + ": " + (data.mobNumKilled.get(data.mobsKilled.indexOf(e2))) + "/"
+ (data.mobNumKilled.get(data.mobsKilled.indexOf(e2))) + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e)));
+ "/" + (stage.mobNumToKill.get(stage.mobsToKill.indexOf(e))); message = message.replace("<location>",
stage.killNames.get(stage.mobsToKill.indexOf(e)));
} }
} }
if (depends.getPlaceholderApi() != null) { if (depends.getPlaceholderApi() != null) {
@ -974,8 +975,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
if (getSettings().canTranslateItems()) { if (getSettings().canTranslateItems()) {
localeQuery.sendMessage(quester.getPlayer(), message, e, null); localeQuery.sendMessage(quester.getPlayer(), message, e, null);
} else { } else {
quester.getPlayer().sendMessage(message.replace("<mob>", quester.getPlayer().sendMessage(message.replace("<mob>", MiscUtil.getProperMobName(e)));
MiscUtil.getProperMobName(e)));
} }
} }
} }