From 03d1ad54f8d18210ea575194d41ec7971f53a960 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 26 Sep 2017 15:40:11 +0100 Subject: [PATCH] Fix canonical service fetcher method, updates #210 --- .../java/org/spongepowered/asm/service/MixinService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/service/MixinService.java b/src/main/java/org/spongepowered/asm/service/MixinService.java index af139640..dc0fce1a 100644 --- a/src/main/java/org/spongepowered/asm/service/MixinService.java +++ b/src/main/java/org/spongepowered/asm/service/MixinService.java @@ -65,9 +65,12 @@ public final class MixinService { ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); if (MixinService.class.getClassLoader() != systemClassLoader) { try { + String self = Thread.currentThread().getStackTrace()[1].getMethodName(); Class contextServiceClass = Class.forName(MixinService.class.getName(), true, systemClassLoader); - Method mdGetInstance = contextServiceClass.getMethod("getInstance"); - MixinService.instance = (MixinService)mdGetInstance.invoke(null); + if (contextServiceClass != MixinService.class) { + Method mdGetInstance = contextServiceClass.getDeclaredMethod(self); + MixinService.instance = (MixinService)mdGetInstance.invoke(null); + } } catch (Exception ex) { ex.printStackTrace(); }