Upstream
/
ProtocolLib
mirror of https://github.com/dmulloy2/ProtocolLib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Magma support (#1953) 

Tested with Magma v1.16.5 and Paper v1.18.2
This commit is contained in:
opl- 2022-11-25 21:13:33 +01:00 committed by GitHub
parent c31133c20f
commit cc95e19ba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java
View File

@ -73,6 +73,11 @@ public final class MinecraftReflection {
// Cache of getBukkitEntity
private static final Map<Class<?>, MethodAccessor> BUKKIT_ENTITY_CACHE = new HashMap<>();
/**
* The Entity package in Forge 1.5.2
*/
private static final String FORGE_ENTITY_PACKAGE = "net.minecraft.entity";
// Package private for the purpose of unit testing
static CachedPackage minecraftPackage;
static CachedPackage craftbukkitPackage;
@ -171,7 +176,28 @@ public final class MinecraftReflection {
Method getHandle = getCraftEntityClass().getMethod("getHandle");
MINECRAFT_FULL_PACKAGE = getHandle.getReturnType().getPackage().getName();
setDynamicPackageMatcher(MINECRAFT_CLASS_NAME_REGEX);
// Pretty important invariant
if (!MINECRAFT_FULL_PACKAGE.startsWith(MINECRAFT_PREFIX_PACKAGE)) {
// See if we got the Forge entity package
if (MINECRAFT_FULL_PACKAGE.equals(FORGE_ENTITY_PACKAGE)) {
// Use the standard NMS versioned package
MINECRAFT_FULL_PACKAGE = CachedPackage.combine(MINECRAFT_PREFIX_PACKAGE, packageVersion);
} else {
// Assume they're the same instead
MINECRAFT_PREFIX_PACKAGE = MINECRAFT_FULL_PACKAGE;
}
// The package is usually flat, so go with that assumption
String matcher =
(MINECRAFT_PREFIX_PACKAGE.length() > 0 ? Pattern.quote(MINECRAFT_PREFIX_PACKAGE + ".") : "") + CANONICAL_REGEX;
// We'll still accept the default location, however
setDynamicPackageMatcher("(" + matcher + ")|(" + MINECRAFT_CLASS_NAME_REGEX + ")");
} else {
// Use the standard matcher
setDynamicPackageMatcher(MINECRAFT_CLASS_NAME_REGEX);
}
}
return MINECRAFT_FULL_PACKAGE;