Correctly span the classpath

Author: Techcable

base/pom.xml

@@ -44,25 +44,29 @@
             <groupId>net.techcable.spawnshield</groupId>
             <artifactId>worldguard6</artifactId>
             <version>${project.parent.version}</version>
+            <optional>true</optional>
         </dependency>
         <!-- CombatTag Plugin Compatibility -->
         <dependency>
             <groupId>net.techcable.spawnshield</groupId>
             <artifactId>combat-tag</artifactId>
             <version>${project.parent.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.techcable.spawnshield</groupId>
             <artifactId>combat-tag-plus</artifactId>
             <version>${project.parent.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>net.techcable.spawnshield</groupId>
             <artifactId>pvp-manager</artifactId>
             <version>${project.parent.version}</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>

base/src/main/java/net/techcable/spawnshield/SpawnShield.java

@@ -128,7 +128,7 @@ public int getValue() {
 
     @Override
     protected void shutdown() {
-        getSettings().save();
+        if (getSettings() != null) getSettings().save();
     }
 
     @Override

base/src/main/java/net/techcable/spawnshield/combattag/CombatTagHelper.java

@@ -43,7 +43,9 @@
 import java.util.UUID;
 
 import net.techcable.techutils.Reflection;
+import org.reflections.ReflectionUtils;
 import org.reflections.Reflections;
+import org.reflections.util.ClasspathHelper;
 
 import javax.annotation.Nullable;
 
@@ -93,17 +95,11 @@ public static long getRemainingTagTime(Player player) {
 
     public static Set<CombatTagPlugin> findInstalled() {
         Set<CombatTagPlugin> installed = new HashSet<>();
-        String className = MultiPluginCombatTagPlugin.class.getName();
+        String className = CombatTagHelper.class.getName();
         String packageName = className.substring(0, className.lastIndexOf('.') - 1);
-        Reflections reflections = new Reflections(packageName);
-        Set<Class<? extends CombatTagPlugin>> pluginTypes = reflections.getSubTypesOf(CombatTagPlugin.class);
-        pluginTypes = Sets.filter(pluginTypes, new Predicate<Class<? extends CombatTagPlugin>>() {
-            @Override
-            public boolean apply(@Nullable Class<? extends CombatTagPlugin> aClass) {
-                return !MultiPluginCombatTagPlugin.class.isAssignableFrom(aClass);
-            }
-        });
+        Set<Class<? extends CombatTagPlugin>> pluginTypes = new Reflections(packageName).getSubTypesOf(CombatTagPlugin.class);
         for (Class<? extends CombatTagPlugin> pluginType : pluginTypes) {
+            if (pluginType == MultiPluginCombatTagPlugin.class) continue;
             CombatTagPlugin plugin;
             try {
                 Constructor<? extends CombatTagPlugin> c = pluginType.getConstructor();

base/src/main/java/net/techcable/spawnshield/combattag/MultiPluginCombatTagPlugin.java

@@ -37,7 +37,7 @@
 import java.util.Set;
 
 @RequiredArgsConstructor
-public class MultiPluginCombatTagPlugin implements CombatTagPlugin {
+public final class MultiPluginCombatTagPlugin implements CombatTagPlugin {
     private final Set<CombatTagPlugin> plugins;
 
     @Override