Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-19 07:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix method reflection remapping with null parameter types passed

Browse Source 
Fixes #11052
This commit is contained in:
Nassim Jahnke 2024-07-10 18:21:33 +02:00
parent b0ef3ca25a
commit 20889d04d8
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch
View File

@ -331,10 +331,10 @@ index bdd9bc8a414719b9f1d6f01f90539ddb8603a878..fdb52ad85cfaa1d53aadcad72cec3d3c
// Copied from SimplePluginManager#loadPlugins // Copied from SimplePluginManager#loadPlugins
diff --git a/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java b/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java diff --git a/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java b/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..c653d1f5af8b407cfba715e6027dbb695046892a index 0000000000000000000000000000000000000000..795d79bcfc4177edfcb12cf9db392780c3f04aa7
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java +++ b/src/main/java/io/papermc/paper/pluginremap/reflect/PaperReflection.java
@@ -0,0 +1,212 @@ @@ -0,0 +1,216 @@
+package io.papermc.paper.pluginremap.reflect; +package io.papermc.paper.pluginremap.reflect;
+ +
+import com.mojang.logging.LogUtils; +import com.mojang.logging.LogUtils;
@ -395,7 +395,7 @@ index 0000000000000000000000000000000000000000..c653d1f5af8b407cfba715e6027dbb69
+ } + }
+ +
+ @Override + @Override
+ protected String mapDeclaredMethodName(final Class<?> clazz, final String name, final Class<?>... parameterTypes) { + protected String mapDeclaredMethodName(final Class<?> clazz, final String name, final Class<?> @Nullable ... parameterTypes) {
+ final @Nullable Map<String, String> mapping = this.strippedMethodMappings.get(clazz.getName()); + final @Nullable Map<String, String> mapping = this.strippedMethodMappings.get(clazz.getName());
+ if (mapping == null) { + if (mapping == null) {
+ return name; + return name;
@ -404,7 +404,7 @@ index 0000000000000000000000000000000000000000..c653d1f5af8b407cfba715e6027dbb69
+ } + }
+ +
+ @Override + @Override
+ protected String mapMethodName(final Class<?> clazz, final String name, final Class<?>... parameterTypes) { + protected String mapMethodName(final Class<?> clazz, final String name, final Class<?> @Nullable ... parameterTypes) {
+ final @Nullable String mapped = this.findMappedMethodName(clazz, name, parameterTypes); + final @Nullable String mapped = this.findMappedMethodName(clazz, name, parameterTypes);
+ return mapped != null ? mapped : name; + return mapped != null ? mapped : name;
+ } + }
@ -424,7 +424,7 @@ index 0000000000000000000000000000000000000000..c653d1f5af8b407cfba715e6027dbb69
+ return mapped != null ? mapped : name; + return mapped != null ? mapped : name;
+ } + }
+ +
+ private @Nullable String findMappedMethodName(final Class<?> clazz, final String name, final Class<?>... parameterTypes) { + private @Nullable String findMappedMethodName(final Class<?> clazz, final String name, final Class<?> @Nullable ... parameterTypes) {
+ final Map<String, String> map = this.strippedMethodMappings.get(clazz.getName()); + final Map<String, String> map = this.strippedMethodMappings.get(clazz.getName());
+ @Nullable String mapped = null; + @Nullable String mapped = null;
+ if (map != null) { + if (map != null) {
@ -474,11 +474,15 @@ index 0000000000000000000000000000000000000000..c653d1f5af8b407cfba715e6027dbb69
+ return mapped; + return mapped;
+ } + }
+ +
+ private static String strippedMethodKey(final String methodName, final Class<?>... parameterTypes) { + private static String strippedMethodKey(final String methodName, final Class<?> @Nullable ... parameterTypes) {
+ return methodName + parameterDescriptor(parameterTypes); + return methodName + parameterDescriptor(parameterTypes);
+ } + }
+ +
+ private static String parameterDescriptor(final Class<?>... parameterTypes) { + private static String parameterDescriptor(final Class<?> @Nullable ... parameterTypes) {
+ if (parameterTypes == null) {
+ // Null parameterTypes is treated as an empty array
+ return "()";
+ }
+ final StringBuilder builder = new StringBuilder(); + final StringBuilder builder = new StringBuilder();
+ builder.append('('); + builder.append('(');
+ for (final Class<?> parameterType : parameterTypes) { + for (final Class<?> parameterType : parameterTypes) {