From a3445b4482504c5c902bcd536841f6330c7a7af7 Mon Sep 17 00:00:00 2001
From: sky <sky@asgard.me>
Date: Tue, 27 Jul 2021 16:48:31 +0800
Subject: [PATCH] 1.10

---
 build.gradle                                     |  2 +-
 .../io/izzel/taboolib/gradle/RelocateJar.groovy  | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9c466e3..d94e96c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'io.izzel.taboolib'
-version '1.9'
+version '1.10'
 
 configurations {
     embed
diff --git a/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy b/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy
index e809526..f8ad7c6 100644
--- a/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy
+++ b/src/main/groovy/io/izzel/taboolib/gradle/RelocateJar.groovy
@@ -142,9 +142,19 @@ class RelocateJar extends DefaultTask {
         }
     }
 
-    static boolean isIsolated(Map<String, Set<String>> use, Set<String> refer, Map<String, List<String>> isolated, String nameWithOutExtension) {
-        if (isolated.containsKey(nameWithOutExtension)) {
-            return refer.size() <= 1 || refer.stream().allMatch { nameWithOutExtension == it || isolated[nameWithOutExtension].contains(it) || isIsolated(use, use[it], isolated, it) }
+    static boolean isIsolated(
+            Map<String, Set<String>> use,
+            Set<String> refer,
+            Map<String, List<String>> isolated,
+            String name,
+            String exclude = null
+    ) {
+        if (isolated.containsKey(name)) {
+            return refer.size() <= 1 || refer.stream()
+                    .filter { it != exclude }
+                    .allMatch {
+                        name == it || isolated[name].contains(it) || isIsolated(use, use[it], isolated, it, name)
+                    }
         } else {
             return false
         }