Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-03 08:57:43 +02:00
Code Issues Projects Releases Wiki Activity

Fix a couple more Waterfall->Travertine name changes

Browse Source
This commit is contained in:
Troy Frew 2016-06-30 12:44:08 -05:00
parent 1e6817cb1a
commit 4f57bed1d3
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
View File

@ -1,4 +1,4 @@
From 0e9177292842a998994060fca45185732a5cae91 Mon Sep 17 00:00:00 2001
From 3c36519ae2b58024198c6425707ee6530105ddad 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 Travertine
@ -18,9 +18,18 @@ index a4516ed..1f63a2c 100644
return;
}
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 29e2294..fb28fd8 100644
index 3e3ff61..a8d4418 100644
--- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -48,7 +48,7 @@ public class BungeeCordLauncher
if ( buildDate.before( deadline.getTime() ) )
{
System.err.println( "*** Warning, this build is outdated ***" );
- 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.aquifermc.org/job/Travertine/ ***" );
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 ) );
@@ -57,7 +57,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
@ -44,7 +53,7 @@ index 446dfe2..f068a38 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 fc5ca3a..2f1b451 100644
index 92ea9b5..d0ffb70 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -174,7 +174,7 @@ public class BungeeCord extends ProxyServer
@ -117,6 +126,19 @@ index d703d6d..d8dcdc1 100644
this.logger = logger;
}
diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
index 97a08da..f67df84 100644
--- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
+++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
@@ -19,7 +19,7 @@ public class JenkinsModuleSource implements ModuleSource
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
try
{
- URL website = new URL( "https://tc.demonwav.com/guestAuth/repository/download/Waterfall_Build/" + version.getBuild() + "/" + module.getName() + ".jar" );
+ URL website = new URL( "https://tc.demonwav.com/guestAuth/repository/download/Travertine_Build/" + version.getBuild() + "/" + module.getName() + ".jar" );
URLConnection con = website.openConnection();
// 15 second timeout at various stages
con.setConnectTimeout( 15000 );
--
2.9.0
2.7.4 (Apple Git-66)

12
Waterfall-Proxy-Patches/0004-Support-1.7-and-refractor-deserialization-code.patch
View File

@ -1,4 +1,4 @@
From 70750320e472cad8e339550af4430ac85a6c7e70 Mon Sep 17 00:00:00 2001
From 03b5d4e8e3b9a9b0d4a1a804f98b401fe454e939 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 27 Jun 2016 13:03:49 -0700
Subject: [PATCH] Support 1.7 and refractor deserialization code
@ -494,7 +494,7 @@ index 9983ef2..d1a9e17 100644
{
handler.handle( this );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
index e094932..beb9a90 100644
index e1344b3..40ebded 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol.packet;
@ -506,7 +506,7 @@ index e094932..beb9a90 100644
import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream;
import java.io.DataInput;
@@ -19,7 +21,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@@ -18,7 +20,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ -515,7 +515,7 @@ index e094932..beb9a90 100644
{
public PluginMessage(String tag, ByteBuf data, boolean allowExtendedPacket) {
@@ -44,7 +46,7 @@ public class PluginMessage extends DefinedPacket
@@ -43,7 +45,7 @@ public class PluginMessage extends DefinedPacket
private boolean allowExtendedPacket = false;
@Override
@ -524,7 +524,7 @@ index e094932..beb9a90 100644
{
tag = readString( buf );
int maxSize = direction == ProtocolConstants.Direction.TO_SERVER ? Short.MAX_VALUE : 0x100000;
@@ -54,13 +56,25 @@ public class PluginMessage extends DefinedPacket
@@ -53,13 +55,25 @@ public class PluginMessage extends DefinedPacket
}
@Override
@ -690,5 +690,5 @@ index e3bcbc3..b447ecf 100644
writeString( cursor, buf );
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_9 )
--
2.9.0
2.7.4 (Apple Git-66)