spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-04-13 09:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make --compile craftbukkit more consistent and not version dependant

Browse source
This commit is contained in:
Nothixal 2024-02-18 09:09:34 +11:00 • committed by md_5
parent 88401a235a
commit ae85546c00
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/spigotmc/builder/Builder.java
View file

@ -671,7 +671,7 @@ public class Builder
// Git spigotServerGit = Git.open( spigotServer ); // Git spigotServerGit = Git.open( spigotServer );
if ( compile == null || compile.isEmpty() ) if ( compile == null || compile.isEmpty() )
{ {
if ( versionInfo.getToolsVersion() <= 104 || dev ) if ( dev )
{ {
compile = Arrays.asList( Compile.CRAFTBUKKIT, Compile.SPIGOT ); compile = Arrays.asList( Compile.CRAFTBUKKIT, Compile.SPIGOT );
} else } else
@ -752,7 +752,7 @@ public class Builder
finalName = outputNameFlag.value( options ); 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" ) ); copyJar( "CraftBukkit/target", "craftbukkit", suffix, new File( outputDirFlag.value( options ), "craftbukkit-" + versionInfo.getMinecraftVersion() + ".jar" ) );
} }