From 11703076bee62715d944730066a85ed265510a55 Mon Sep 17 00:00:00 2001 From: foss-mc <69294560+foss-mc@users.noreply.github.com> Date: Wed, 16 Dec 2020 18:00:49 +0800 Subject: [PATCH] Disable update checker & Use bungee name diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java index 25da0a65..d4b612b3 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java @@ -45,25 +45,12 @@ public class BungeeCordLauncher return; } - if ( BungeeCord.class.getPackage().getSpecificationVersion() != null && System.getProperty( "IReallyKnowWhatIAmDoingISwear" ) == null ) - { - Date buildDate = new SimpleDateFormat( "yyyyMMdd" ).parse( BungeeCord.class.getPackage().getSpecificationVersion() ); - - Calendar deadline = Calendar.getInstance(); - deadline.add( Calendar.WEEK_OF_YEAR, -8 ); - if ( buildDate.before( deadline.getTime() ) ) - { - System.err.println( "*** Hey! This build is potentially outdated :( ***" ); - System.err.println( "*** Please check for a new build from https://papermc.io/downloads ***" ); - System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" ); - System.err.println( "*** Server will start in 10 seconds ***" ); - Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); - } - } + // FlameCord - Disable update checker BungeeCord bungee = new BungeeCord(); ProxyServer.setInstance( bungee ); - bungee.getLogger().info( "Enabled FlameCord version " + bungee.getVersion() ); + // FlameCord - Use bungee name + bungee.getLogger().info( "Enabled " + bungee.getName() + " version " + bungee.getVersion() ); bungee.start(); if ( !options.has( "noconsole" ) ) diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java index 9c11ac57..ae4c7ac2 100644 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java @@ -22,6 +22,7 @@ import java.util.Locale; import java.util.Map; import java.util.logging.Level; import lombok.RequiredArgsConstructor; +import net.md_5.bungee.BungeeCord; import net.md_5.bungee.Util; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ProxyServer; @@ -227,7 +228,8 @@ public class YamlConfig implements ConfigurationAdapter Map val = entry.getValue(); String name = entry.getKey(); String addr = get( "address", "localhost:25565", val ); - String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another FlameCord - Forced Host", val ) ); + // FlameCord - Use Bungee name instead + String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another " + BungeeCord.getInstance().getName() + " - Forced Host", val ) ); boolean restricted = get( "restricted", false, val ); SocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); @@ -253,7 +255,8 @@ public class YamlConfig implements ConfigurationAdapter for ( Map val : base ) { - String motd = get( "motd", "&1Another Bungee server", val ); + // FlameCord - Use Bungee name instead + String motd = get( "motd", "&1Another " + BungeeCord.getInstance().getName() + " server", val ); motd = ChatColor.translateAlternateColorCodes( '&', motd ); int maxPlayers = get( "max_players", 1, val ); -- 2.32.0