From 769aac51e892129c3f5bd70045b269c4ad00633d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 19 Dec 2015 00:05:02 +0000 Subject: [PATCH] Use java.lang.Object ctor on CallbackInfoReturnable for array, fixes #83 --- .../asm/mixin/injection/callback/CallbackInfo.java | 2 +- .../asm/mixin/injection/callback/CallbackInfoReturnable.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java index fc3735a6..5c954ce7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java @@ -118,7 +118,7 @@ public class CallbackInfo implements Cancellable { return CallbackInfo.getConstructorDescriptor(); } - if (returnType.getSort() == Type.OBJECT) { + if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { return String.format("(%sZ%s)V", CallbackInfo.STRING, CallbackInfo.OBJECT); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java index b0e769e9..8d152a66 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java @@ -124,7 +124,7 @@ public class CallbackInfoReturnable extends CallbackInfo { // CHECKSTYLE:ON static String getReturnAccessor(Type returnType) { - if (returnType.getSort() == Type.OBJECT) { + if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { return "getReturnValue"; } @@ -132,7 +132,7 @@ public class CallbackInfoReturnable extends CallbackInfo { } static String getReturnDescriptor(Type returnType) { - if (returnType.getSort() == Type.OBJECT) { + if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { return String.format("()%s", CallbackInfo.OBJECT); }