From f18d8f8adf8c7c0b5b64dfe7b9fa5ab26afda228 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 17 Sep 2019 13:48:44 +0100 Subject: [PATCH] Ensure CHECKCAST is added for arrays as well as objects, fixes #358 --- .../asm/mixin/injection/callback/CallbackInjector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 8db18ef5..16edfdd8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java @@ -746,7 +746,7 @@ public class CallbackInjector extends Injector { String accessor = CallbackInfoReturnable.getReturnAccessor(callback.target.returnType); String descriptor = CallbackInfoReturnable.getReturnDescriptor(callback.target.returnType); callback.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, this.callbackInfoClass, accessor, descriptor, false)); - if (callback.target.returnType.getSort() == Type.OBJECT) { + if (callback.target.returnType.getSort() >= Type.ARRAY) { callback.add(new TypeInsnNode(Opcodes.CHECKCAST, callback.target.returnType.getInternalName())); } callback.add(new InsnNode(callback.target.returnType.getOpcode(Opcodes.IRETURN)));