Return null if enum found no matches

libraryaddict · Nov 17, 2024 · 9815a74 · 9815a74
1 parent f8594e7
commit 9815a74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassMappings.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ClassMappings.java
@@ -95,6 +95,7 @@ private static String[] getPackages() {
     private static String getVersion() {
         String version = Bukkit.getVersion() + "\t" + LibsDisguises.getInstance().getDescription().getVersion();
 
+        // 1.21.3 has every build with this
         if (DisguiseUtilities.isRunningPaper() && NmsVersion.v1_21_R2.isSupported()) {
             ServerBuildInfo buildInfo = ServerBuildInfo.buildInfo();
 

diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java
@@ -2683,6 +2683,8 @@ public static <T> T fromEnum(Class<T> clss, String name) {
 
                 return e;
             }
+
+            return null;
         }
 
         return (T) Bukkit.getRegistry((Class<Keyed>) clss).get(new NamespacedKey(split[0], split[1]));

diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java
@@ -116,7 +116,7 @@ private void loadSounds() {
 
                     for (String sound : sounds) {
                         try {
-                            Sound actualSound = ReflectionManager.fromEnum(Sound.class,sound);
+                            Sound actualSound = ReflectionManager.fromEnum(Sound.class, sound);
 
                             group.addSound(actualSound, type);
                         } catch (Exception ignored) {
-Original file line number
+Diff line change
@@ Expand Up @@
                     return e;
                 }
+                return null;
             }
             return (T) Bukkit.getRegistry((Class<Keyed>) clss).get(new NamespacedKey(split[0], split[1]));
@@ Expand Down @@