Merge remote-tracking branch 'fabric/main' into lunar

LunarClient · Oct 10, 2023 · db05468 · db05468
2 parents 38ba958 + 9213536
commit db05468
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ packaging=jar
 description=Mixin
 url=https://www.spongepowered.org
 organization=SpongePowered
-buildVersion=0.8.5+lunar.2
+buildVersion=0.8.5+lunar.3
 buildType=RELEASE
 asmVersion=9.2
 legacyForgeAsmVersion=5.0.3

diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
@@ -750,6 +750,8 @@ protected void instanceCallbackInfo(final Callback callback, String id, String d
         if (store) {
             callback.target.addLocalVariable(this.callbackInfoVar, "callbackInfo" + this.callbackInfoVar, "L" + this.callbackInfoClass + ";");
             callback.add(new VarInsnNode(Opcodes.ASTORE, this.callbackInfoVar), false, false, head);
+        } else if (callback.isAtReturn) {
+            callback.target.addLocalVariable(this.callbackInfoVar, "returnValue" + this.callbackInfoVar, callback.target.returnType.getDescriptor());
         }
     }
 

diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java
@@ -875,9 +875,8 @@ private void updateDynamicBinding(MethodNode method, MemberRef methodRef) {
     }
 
     private void updateBinding(MethodNode method, MemberRef methodRef, Traversal traversal) {
-        if (Constants.CTOR.equals(method.name)
-                || methodRef.getOwner().equals(this.getTarget().getClassRef())
-                || this.getTarget().getClassRef().startsWith("<")) {
+        if (Constants.CTOR.equals(methodRef.getName())
+                || methodRef.getOwner().equals(this.getTarget().getClassRef())) {
             return;
         }