From e5322074b8b0bc1438192167af57898a823860c9 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Sun, 2 Apr 2023 13:01:20 -0400
Subject: [PATCH] Fix loading of underscored mobs-to-tame, fixes #2084

---
 core/src/main/java/me/blackvein/quests/Quests.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/me/blackvein/quests/Quests.java b/core/src/main/java/me/blackvein/quests/Quests.java
index 4ed771b9e..6717e4e6f 100644
--- a/core/src/main/java/me/blackvein/quests/Quests.java
+++ b/core/src/main/java/me/blackvein/quests/Quests.java
@@ -3413,18 +3413,18 @@ public class Quests extends JavaPlugin implements QuestsAPI {
                             final List<Integer> mobAmounts = config.getIntegerList("quests." + questKey + ".stages.ordered." 
                                     + stageNum + ".mob-tame-amounts");
                             for (final String mob : mobs) {
-                                if (mob != null) {
-                                    final Class<? extends Entity> ec = EntityType.valueOf(mob.toUpperCase())
-                                            .getEntityClass();
+                                final EntityType type = MiscUtil.getProperMobType(mob);
+                                if (type != null) {
+                                    final Class<? extends Entity> ec = type.getEntityClass();
                                     if (ec != null && Tameable.class.isAssignableFrom(ec)) {
-                                        oStage.addMobToTame(EntityType.valueOf(mob.toUpperCase()));
+                                        oStage.addMobToTame(type);
                                         oStage.addMobNumToTame(mobAmounts.get(mobs.indexOf(mob)));
                                     } else {
                                         throw new StageFormatException("mobs-to-tame has invalid tameable mob " + mob,
                                                 quest, stageNum);
                                     }
                                 } else {
-                                    throw new StageFormatException("mobs-to-tame has invalid mob", quest, stageNum);
+                                    throw new StageFormatException("mobs-to-tame has invalid mob name " + mob, quest, stageNum);
                                 }
                             }
                         } else {