mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-06 18:51:21 +01:00
e76554de59
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by 2LStudios and as with ANY update, please do your own testing Waterfall Changes:f17de74remove 4MB buffer size limit due to protocol changesdc044fbDon't bother locking to fetch a v4 UUID from the offline UUIDs map Signed-off-by: norhu1130 <norhu1130@naver.com>
110 lines
6.0 KiB
Diff
110 lines
6.0 KiB
Diff
From 97946438e45cb5480c3924d5c340cecd1f1a354f Mon Sep 17 00:00:00 2001
|
|
From: Techcable <Techcable@techcable.net>
|
|
Date: Mon, 6 Jun 2016 13:47:46 -0600
|
|
Subject: [PATCH] Rename references from Waterfall to FlameCord
|
|
|
|
|
|
diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
|
|
index a4516ed9..9838f5c5 100644
|
|
--- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
|
|
+++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
|
|
@@ -7,7 +7,7 @@ public class Bootstrap
|
|
{
|
|
if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
|
|
{
|
|
- System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" );
|
|
+ System.err.println( "*** ERROR *** FlameCord requires Java 8 or above to function! Please download and install it!" );
|
|
System.out.println( "You can check your Java version with the command: java -version" );
|
|
return;
|
|
}
|
|
diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
|
|
index d703d6d2..49dce84b 100644
|
|
--- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
|
|
+++ b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
|
|
@@ -12,7 +12,7 @@ public class LogDispatcher extends Thread
|
|
|
|
public LogDispatcher(BungeeLogger logger)
|
|
{
|
|
- super( "Waterfall Logger Thread" );
|
|
+ super( "FlameCord Logger Thread" );
|
|
this.logger = logger;
|
|
}
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
index 07d74c67..a4b58d9c 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -188,7 +188,7 @@ public class BungeeCord extends ProxyServer
|
|
public BungeeCord() throws IOException
|
|
{
|
|
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
|
|
- Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
|
|
+ Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use FlameCord in directory with ! in path." );
|
|
|
|
try
|
|
{
|
|
@@ -539,7 +539,7 @@ public class BungeeCord extends ProxyServer
|
|
@Override
|
|
public String getName()
|
|
{
|
|
- return "Waterfall";
|
|
+ return "FlameCord";
|
|
}
|
|
|
|
@Override
|
|
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 0db3d76a..25da0a65 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
@@ -63,7 +63,7 @@ public class BungeeCordLauncher
|
|
|
|
BungeeCord bungee = new BungeeCord();
|
|
ProxyServer.setInstance( bungee );
|
|
- bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
|
|
+ bungee.getLogger().info( "Enabled FlameCord version " + bungee.getVersion() );
|
|
bungee.start();
|
|
|
|
if ( !options.has( "noconsole" ) )
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
|
|
index b26035cf..820f7b03 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
|
|
@@ -16,6 +16,6 @@ public class CommandBungee extends Command
|
|
@Override
|
|
public void execute(CommandSender sender, String[] args)
|
|
{
|
|
- sender.sendMessage( ChatColor.BLUE + "This server is running Waterfall version " + ProxyServer.getInstance().getVersion() + " by md_5" );
|
|
+ sender.sendMessage( ChatColor.BLUE + "This server is running FlameCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
|
|
}
|
|
}
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
|
|
index 720d0c3b..5ab4db18 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
|
|
@@ -23,7 +23,7 @@ public class CommandReload extends Command
|
|
BungeeCord.getInstance().startListeners();
|
|
BungeeCord.getInstance().getPluginManager().callEvent( new ProxyReloadEvent( sender ) );
|
|
|
|
- sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "Waterfall has been reloaded."
|
|
- + " This is NOT advisable and you will not be supported with any issues that arise! Please restart Waterfall ASAP." );
|
|
+ sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "FlameCord has been reloaded."
|
|
+ + " This is NOT advisable and you will not be supported with any issues that arise! Please restart FlameCord ASAP." );
|
|
}
|
|
}
|
|
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 0644b8cd..9c11ac57 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
|
|
@@ -227,7 +227,7 @@ public class YamlConfig implements ConfigurationAdapter
|
|
Map<String, Object> val = entry.getValue();
|
|
String name = entry.getKey();
|
|
String addr = get( "address", "localhost:25565", val );
|
|
- String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) );
|
|
+ String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another FlameCord - Forced Host", val ) );
|
|
boolean restricted = get( "restricted", false, val );
|
|
SocketAddress address = Util.getAddr( addr );
|
|
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
|
|
--
|
|
2.32.0.windows.1
|
|
|