BUILDTOOLS-507: Check --compile NONE flag if toolsVersion < 101 before a craftbukkit jar copy

This commit is contained in:
klugemonkey 2020-01-04 18:45:37 -08:00 committed by md_5
parent 0e60cdb52f
commit 623ceddf02

View file

@ -616,7 +616,7 @@ public class Builder
} }
System.out.println( "Success! Everything completed successfully. Copying final .jar files now." ); System.out.println( "Success! Everything completed successfully. Copying final .jar files now." );
if ( versionInfo.getToolsVersion() < 101 || ( versionInfo.getToolsVersion() > 104 && compile.contains( Compile.CRAFTBUKKIT ) ) ) if ( ( versionInfo.getToolsVersion() < 101 && !compile.contains( Compile.NONE ) ) || ( versionInfo.getToolsVersion() > 104 && compile.contains( Compile.CRAFTBUKKIT ) ) )
{ {
copyJar( "CraftBukkit/target", "craftbukkit", new File( outputDir.value( options ), "craftbukkit-" + versionInfo.getMinecraftVersion() + ".jar" ) ); copyJar( "CraftBukkit/target", "craftbukkit", new File( outputDir.value( options ), "craftbukkit-" + versionInfo.getMinecraftVersion() + ".jar" ) );
} }