Skip to content

Commit

Permalink
Restore Minecraft version suffix
Browse files Browse the repository at this point in the history
  • Loading branch information
kashike committed May 15, 2024
1 parent d7ebb50 commit 432d27e
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions patches/server/1049-Improve-server-version.patch
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ index 87bb3fd9b97506f61734ae7f2e6860610ba794e7..390d333ab83e33f5ea690bbd489706c9
"Git-Commit" to gitHash, // Paper
"CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index da1aed63af837b193900bb85393611edbd56c363..e3076ccc78bc0dc9b8229862c805360e04d60e14 100644
index da1aed63af837b193900bb85393611edbd56c363..3e204bcfd2cdd7af89cc3daef986539754848d3c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -398,7 +398,7 @@ public final class CraftServer implements Server {
Expand All @@ -47,12 +47,3 @@ index da1aed63af837b193900bb85393611edbd56c363..e3076ccc78bc0dc9b8229862c805360e
this.structureManager = new CraftStructureManager(console.getStructureManager(), console.registryAccess());
this.dataPackManager = new CraftDataPackManager(this.getServer().getPackRepository());
this.serverTickManager = new CraftServerTickManager(console.tickRateManager());
@@ -619,7 +619,7 @@ public final class CraftServer implements Server {

@Override
public String getVersion() {
- return this.serverVersion + " (MC: " + this.console.getServerVersion() + ")";
+ return this.serverVersion != null ? this.serverVersion : ""; // Paper - use the implementation version directly
}

@Override

0 comments on commit 432d27e

Please sign in to comment.