From 3bd394ce129f766037b1bd1ee155e19006b8cf6a Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Tue, 13 Nov 2018 00:26:56 -0500
Subject: [PATCH] Ensure valid entity name translation, fixes #503. Bump
 version number

---
 pom.xml                                               | 2 +-
 src/main/java/me/blackvein/quests/ObjectiveTimer.java | 2 +-
 src/main/java/me/blackvein/quests/Quester.java        | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d84c450a6..20e527136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>me.blackvein.quests</groupId>
     <artifactId>quests</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.1</version>
     <name>quests</name>
     <url>https://github.com/FlyingPikachu/Quests/</url>
     <packaging>jar</packaging>
diff --git a/src/main/java/me/blackvein/quests/ObjectiveTimer.java b/src/main/java/me/blackvein/quests/ObjectiveTimer.java
index 168b0906f..ead2664a0 100644
--- a/src/main/java/me/blackvein/quests/ObjectiveTimer.java
+++ b/src/main/java/me/blackvein/quests/ObjectiveTimer.java
@@ -39,7 +39,7 @@ public class ObjectiveTimer extends BukkitRunnable {
             quest.failQuest(quester);
             quester.updateJournal();
         } else {
-            quester.getPlayer().sendMessage(Lang.get(quester.getPlayer(), "timerMessage").replaceAll("<time>", String.valueOf(time)));
+            quester.getPlayer().sendMessage(Lang.get(quester.getPlayer(), "timerMessage").replace("<time>", String.valueOf(time)));
         }
     }
 }
diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java
index 0e2276f91..b9b04da37 100644
--- a/src/main/java/me/blackvein/quests/Quester.java
+++ b/src/main/java/me/blackvein/quests/Quester.java
@@ -434,8 +434,12 @@ public class Quester {
 						Material m = Material.matchMaterial(serial);
 						plugin.query.sendMessage(player, s.replace(serial, "<item>"), m);
 					} else if (EntityType.valueOf(serial.toUpperCase().replace(" ", "_")) != null) {
-						EntityType type = EntityType.valueOf(serial.toUpperCase().replace(" ", "_"));
-						plugin.query.sendMessage(player, s.replace(serial, "<mob>"), type);
+						try {
+							EntityType type = EntityType.valueOf(serial.toUpperCase().replace(" ", "_"));
+							plugin.query.sendMessage(player, s.replace(serial, "<mob>"), type);
+						} catch (IllegalArgumentException e) {
+							player.sendMessage(s);
+						}
 					} else {
 						player.sendMessage(s);
 					}