3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-25 15:50:14 +01:00

Don't show git version string twice

Dieser Commit ist enthalten in:
Camotoy 2024-06-30 22:03:30 -04:00
Ursprung d800f733db
Commit 7612686972
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 7EEFB66FE798081F
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -89,7 +89,7 @@ sourceSets {
blossom { blossom {
val info = GitInfo() val info = GitInfo()
javaSources { javaSources {
property("version", "${info.version} (${info.gitVersion})") property("version", info.version)
property("gitVersion", info.gitVersion) property("gitVersion", info.gitVersion)
property("buildNumber", info.buildNumber.toString()) property("buildNumber", info.buildNumber.toString())
property("branch", info.branch) property("branch", info.branch)

Datei anzeigen

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