From d5cee1b2f5557f4e1c056f28398a0d67d19fc520 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Thu, 26 Dec 2019 19:34:52 +0000
Subject: [PATCH] Make NewInstanceTransformer idempotent

---
 .../openrs2/deob/ast/transform/NewInstanceTransformer.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
index 392c2692..0d0bce97 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
@@ -13,10 +13,14 @@ class NewInstanceTransformer : Transformer() {
             }
 
             expr.scope.ifPresent { scope ->
-                if (!scope.isMethodCallExpr || scope.asMethodCallExpr().nameAsString != "getConstructor") {
+                if (!scope.isMethodCallExpr || scope.asMethodCallExpr().nameAsString !in CONSTRUCTOR_METHODS) {
                     expr.setScope(MethodCallExpr(scope.clone(), "getDeclaredConstructor"))
                 }
             }
         }
     }
+
+    companion object {
+        val CONSTRUCTOR_METHODS = setOf("getConstructor", "getDeclaredConstructor")
+    }
 }