From 48f9ad86f082d71624aa630d49d69b7a0faa9f4e Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 6 May 2023 11:20:54 -0400 Subject: [PATCH] Prevent immediate crash when TextureAtlasSprite constructor throws Fixes #79 --- .../modernfix/platform/forge/ModernFixPlatformHooksImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java index d2c84cf8..f8eb19e6 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java +++ b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java @@ -118,7 +118,10 @@ public class ModernFixPlatformHooksImpl { try { return (TextureAtlasSprite)textureAtlasSpriteConstruct.invokeExact(atlasTexture, textureInfo, mipmapLevel, atlasWidth, atlasHeight, spriteX, spriteY, image); } catch(Throwable e) { - throw new AssertionError("MethodHandle failed", e); + if(e instanceof RuntimeException) + throw (RuntimeException)e; + else + throw new RuntimeException("TextureAtlasSprite construction failed", e); } } }