From 1ac0ab193870dfe4eeab6d732caa0d5abf1f86cf Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Fri, 28 Mar 2025 04:41:06 +0800 Subject: [PATCH] fix changes --- .../craftengine/bukkit/plugin/injector/BukkitInjector.java | 4 ++-- .../net/momirealms/craftengine/bukkit/util/Reflections.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BukkitInjector.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BukkitInjector.java index cc4bd7942..a2656ed50 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BukkitInjector.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BukkitInjector.java @@ -96,8 +96,8 @@ public class BukkitInjector { .method(ElementMatchers.any() .and(ElementMatchers.not(ElementMatchers.is(Reflections.method$PalettedContainer$getAndSet))) .and(ElementMatchers.not(ElementMatchers.isDeclaredBy(Object.class))) - // 1.21.5+, do - .and(ElementMatchers.not(ElementMatchers.named("get").and(ElementMatchers.takesArguments(int.class)).and(ElementMatchers.returns(Object.class)))) + // TODO Requires Paper Patch + //.and(ElementMatchers.not(ElementMatchers.named("get").and(ElementMatchers.takesArguments(int.class)).and(ElementMatchers.returns(Object.class)))) ) .intercept(MethodDelegation.toField("target")) .method(ElementMatchers.is(Reflections.method$PalettedContainer$getAndSet)) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java index 2193e2758..bcd33e054 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/Reflections.java @@ -5710,7 +5710,6 @@ public class Reflections { .orElse(null); // 1.21.4#222+ - // 我tm服了这个 sb paper 你 tmd 乱改签名干什么有病啊 public static final Method method$DiscardedPayload$dataByteArray = Optional.ofNullable(method$DiscardedPayload$data) .map(m -> (Method) null) .orElseGet(() -> Optional.ofNullable(clazz$DiscardedPayload)