From 6d36db0e828ad2f400e2145e51e60ba6e4a8f70c Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 21 Mar 2020 17:30:03 +0100 Subject: [PATCH] Fix branding --- patches/server/0002-Brandings.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/patches/server/0002-Brandings.patch b/patches/server/0002-Brandings.patch index 1636ae4b..ee025378 100644 --- a/patches/server/0002-Brandings.patch +++ b/patches/server/0002-Brandings.patch @@ -73,12 +73,13 @@ index 0b65cbb2..4b27af23 100644 import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { -+ private final String serverName = "YAPFA"; // YAPFA +- private final String serverName = "Tuinity"; // Paper // Tuinity ++ private final String serverName = "YAPFA"; // Paper // Tuinity // YAPFA private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 770375ed4..d88cc3383 100644 +index 770375ed..aefa51ac 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -86,19 +87,19 @@ index 770375ed4..d88cc3383 100644 @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { - return new com.destroystokyo.paper.PaperVersionFetcher(); -+ return new de.tr7zw.yapfa.YapfaVersionFetcher();//YAPFA ++ return new de.tr7zw.yapfa.YapfaVersionFetcher(); //YAPFA } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 674096cab..e3c4ad3d3 100644 +index 001b1e51..e3c4ad3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; -- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties"); +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.tuinity/tuinity-api/pom.properties"); // Tuinity + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/de.tr7zw.yapfa/yapfa-api/pom.properties"); // YAPFA Properties properties = new Properties();