From c34ad1ca0f435a9da2143f0280c4915cf78b476f Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 9 Sep 2022 07:47:12 +0200 Subject: [PATCH] Allow minecraft names instead of bukkit names for entities --- .../de/diddiz/LogBlock/util/BukkitUtils.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java b/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java index f7516f3..4f4cfe2 100644 --- a/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java +++ b/src/main/java/de/diddiz/LogBlock/util/BukkitUtils.java @@ -946,15 +946,19 @@ public class BukkitUtils { private static final HashMap types = new HashMap<>(); static { for (EntityType t : EntityType.values()) { - types.put(t.name().toLowerCase(), t); - @SuppressWarnings("deprecation") - String typeName = t.getName(); - if (typeName != null) { - types.put(typeName.toLowerCase(), t); - } - Class ec = t.getEntityClass(); - if (ec != null) { - types.put(ec.getSimpleName().toLowerCase(), t); + if (t != EntityType.UNKNOWN) { + types.put(t.name().toLowerCase(), t); + @SuppressWarnings("deprecation") + String typeName = t.getName(); + if (typeName != null) { + types.put(typeName.toLowerCase(), t); + } + Class ec = t.getEntityClass(); + if (ec != null) { + types.put(ec.getSimpleName().toLowerCase(), t); + } + types.put(t.getKey().getKey(), t); + types.put(t.getKey().toString(), t); } } }