From 95ba3347b23ec0a287ed910dcc33ba10942a90a4 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Sun, 19 May 2024 07:29:23 +0200 Subject: [PATCH] fix skin reflection on 1.20.6 (fixes #140) --- .../lol/pyr/znpcsplus/reflection/ReflectionPackage.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java index 2c8e046..4fb169f 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/reflection/ReflectionPackage.java @@ -15,14 +15,14 @@ import java.util.stream.Collectors; */ public class ReflectionPackage { private static final String VERSION = generateVersion(); - public static final String BUKKIT = "org.bukkit.craftbukkit." + VERSION; + public static final String BUKKIT = "org.bukkit.craftbukkit" + VERSION; private static final boolean flattened = !PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_17); /** * Check if the classes are flattened, if so we need to add the version string into the * package string which is another quirk of the old server jars. */ - public static final String MINECRAFT = joinWithDot("net.minecraft", flattened ? "server." + VERSION : ""); + public static final String MINECRAFT = joinWithDot("net.minecraft", flattened ? "server" + VERSION : ""); public static final String ENTITY = flattened ? MINECRAFT : joinWithDot(MINECRAFT, "world.entity"); public static String joinWithDot(String... parts) { @@ -34,7 +34,7 @@ public class ReflectionPackage { private static String generateVersion() { String[] parts = Bukkit.getServer().getClass().getPackage().getName().split("\\."); - if (parts.length > 3) return parts[3]; + if (parts.length > 3) return "." + parts[3]; return ""; } }