OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-22 14:56:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't show git version string twice

Browse source
This commit is contained in:
Camotoy 2024-06-30 22:03:30 -04:00
parent d800f733db
commit 7612686972
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/build.gradle.kts
View file

@ -89,7 +89,7 @@ sourceSets {
blossom {
val info = GitInfo()
javaSources {
property("version", "${info.version} (${info.gitVersion})")
property("version", info.version)
property("gitVersion", info.gitVersion)
property("buildNumber", info.buildNumber.toString())
property("branch", info.branch)
@ -156,4 +156,4 @@ tasks.register<DownloadFilesTask>("downloadBedrockData") {
suffixedFiles = listOf("block_palette.nbt", "creative_items.json", "runtime_item_states.json")
destinationDir = "$projectDir/src/main/resources/bedrock"
}
}

2
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View file

@ -694,7 +694,7 @@ public class GeyserImpl implements GeyserApi {
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
public boolean isProductionEnvironment() {
// First is if Blossom runs, second is if Blossom doesn't run
//noinspection ConstantConditions,MismatchedStringCase - changes in production
//noinspection ConstantConditions - changes in production
return !("git-local/dev-0000000".equals(GeyserImpl.GIT_VERSION) || "${gitVersion}".equals(GeyserImpl.GIT_VERSION));
}