From 46fed25da48297ceec0db4729d86c6849677a1c8 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Tue, 7 Jan 2025 16:38:40 +0100 Subject: [PATCH] Fix renaming for class name duplications --- SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java index 8cb72214..e666debe 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java @@ -153,13 +153,12 @@ public final class Reflection { return Class.forName(ORG_BUKKIT_CRAFTBUKKIT + name.substring(22)); } else if(MAJOR_VERSION < 17 && name.startsWith("net.minecraft")) { return Class.forName(LEGACY_NET_MINECRAFT_SERVER + "." + name.split("[.](?=[^.]*$)")[1]); + } else if(MAJOR_VERSION < 21 || MINOR_VERSION < 4) { + return Class.forName(spigotClassnames.getOrDefault(name, name)); } else { return Class.forName(name); } } catch (ClassNotFoundException e) { - if(spigotClassnames.containsKey(name)) - return getClass(spigotClassnames.get(name)); - throw new IllegalArgumentException("Cannot find " + name, e); } }