Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-06-26 14:35:05 +02:00
Code Issues Projects Releases Wiki Activity

Implement changes proposed in #124

Browse Source
This commit is contained in:
Jamie Mansfield 2017-06-10 20:57:00 +01:00
parent cb4d5effb9
commit 0a0f6974f3
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,11 +1,11 @@
From 70bc204b8f48aaec90fb5561ec9cf7ba646018d0 Mon Sep 17 00:00:00 2001
From 42fd1a98ebe2532206ca05ae1419d2143df04990 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall
diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 3c1bbe93..5e1773c3 100644
index 3c1bbe93..8766e04b 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -42,7 +42,7 @@ public class BungeeCordLauncher
@ -13,7 +13,7 @@ index 3c1bbe93..5e1773c3 100644
{
System.err.println( "*** Warning, this build is outdated ***" );
- System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
+ System.err.println( "*** Please download a new build from https://ci.aquifermc.org/job/Waterfall/ ***" );
+ System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
System.err.println( "*** You will get NO support regarding this build ***" );
System.err.println( "*** Server will start in 10 seconds ***" );
Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
@ -53,7 +53,7 @@ index 9d51608d..446dfe2f 100644
while ( bungee.isRunning )
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 f31faa99..259c20fc 100644
index 653a4720..140a63fb 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -178,7 +178,7 @@ public class BungeeCord extends ProxyServer
@ -114,5 +114,5 @@ index c7547c7f..82ff91ae 100644
InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.12.0
2.13.0

26
BungeeCord-Patches/0042-Improve-outdated-build-message.patch Normal file
View File

@ -0,0 +1,26 @@
From f63e39c39c6bb7705cfe798189a01579beab115a Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message
diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 8766e04b..ce1dd7a3 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -41,9 +41,9 @@ public class BungeeCordLauncher
deadline.add( Calendar.WEEK_OF_YEAR, -4 );
if ( buildDate.before( deadline.getTime() ) )
{
- System.err.println( "*** Warning, this build is outdated ***" );
- System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
- System.err.println( "*** You will get NO support regarding this build ***" );
+ System.err.println( "*** Hey! This build is potentially outdated :( ***" );
+ System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
+ 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 ) );
}
--
2.13.0