Merge upstream

PaperMC · Mar 7, 2017 · 1073945 · 1073945 · jamierocks · Mar 7, 2017
1 parent 32a7625
commit 1073945
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/BungeeCord b/BungeeCord
diff --git a/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch b/BungeeCord-Patches/0005-Fetch-modules-from-the-Waterfall-CI.patch
@@ -1,12 +1,12 @@
-From 28078a776b6453b116f7cf174848c63047756c97 Mon Sep 17 00:00:00 2001
+From f5b593bf418986576c964147923f5d429affc074 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall CI
 
 Don't fetch from the BungeeCord CI, as that only has their modules
 
 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 9bd2dc9..d93aa1c 100644
+index 2536435c..6eb10df7 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
 @@ -1,10 +1,11 @@
@@ -23,12 +23,15 @@ index 9bd2dc9..d93aa1c 100644
  import lombok.Data;
  import net.md_5.bungee.Util;
 
-@@ -18,13 +19,14 @@ public class JenkinsModuleSource implements ModuleSource
+@@ -18,13 +19,18 @@ public class JenkinsModuleSource implements ModuleSource
          System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
          try
          {
--            URL website = new URL( "http://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
++<<<<<<< HEAD
+             URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
++=======
 +            URL website = new URL( "https://ci.destroystokyo.com/job/Waterfall/" + version.getBuild() + "/artifact/Waterfall-Proxy/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
++>>>>>>> Fetch modules from the Waterfall CI
              URLConnection con = website.openConnection();
              // 15 second timeout at various stages
              con.setConnectTimeout( 15000 );
@@ -41,5 +44,5 @@ index 9bd2dc9..d93aa1c 100644
          } catch ( IOException ex )
          {
 -- 
-2.10.0
+2.11.1