From ae85546c0055b92a9583f4c06979b6273c272e86 Mon Sep 17 00:00:00 2001 From: Nothixal Date: Sun, 18 Feb 2024 09:09:34 +1100 Subject: [PATCH] Make `--compile craftbukkit` more consistent and not version dependant --- src/main/java/org/spigotmc/builder/Builder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java index bdb2e71..58958df 100644 --- a/src/main/java/org/spigotmc/builder/Builder.java +++ b/src/main/java/org/spigotmc/builder/Builder.java @@ -671,7 +671,7 @@ public class Builder // Git spigotServerGit = Git.open( spigotServer ); if ( compile == null || compile.isEmpty() ) { - if ( versionInfo.getToolsVersion() <= 104 || dev ) + if ( dev ) { compile = Arrays.asList( Compile.CRAFTBUKKIT, Compile.SPIGOT ); } else @@ -752,7 +752,7 @@ public class Builder finalName = outputNameFlag.value( options ); } - if ( compile.contains( Compile.CRAFTBUKKIT ) && ( versionInfo.getToolsVersion() < 101 || versionInfo.getToolsVersion() > 104 ) ) + if ( compile.contains( Compile.CRAFTBUKKIT ) ) { copyJar( "CraftBukkit/target", "craftbukkit", suffix, new File( outputDirFlag.value( options ), "craftbukkit-" + versionInfo.getMinecraftVersion() + ".jar" ) ); }