Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-01 05:27:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2018-08-05 13:48:53 +01:00
parent 3fd1c6f6d8
commit ebdac40aee
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 715ec07a289c74bb7639194048b4e3fd2b50f0ad
Subproject commit 9bc41433e7e53d406a96f9194ec30e97c33da3bc

22
BungeeCord-Patches/0048-temporary-Fix-broken-upstream-build.patch Normal file
View File

@ -0,0 +1,22 @@
From a2614c692d4251c501768ba11f6fe2566274cad2 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sun, 5 Aug 2018 13:54:39 +0100
Subject: [PATCH] temporary: Fix broken upstream build
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerConnectRequest.java b/api/src/main/java/net/md_5/bungee/api/ServerConnectRequest.java
index 578546dd..33d2f446 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerConnectRequest.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerConnectRequest.java
@@ -59,7 +59,7 @@ public class ServerConnectRequest
/**
* Timeout in milliseconds for request.
*/
- @Builder.Default
+ @lombok.Builder.Default
private final int connectTimeout = 5000; // TODO: Configurable
/**
* Should the player be attempted to connect to the next server in their
--
2.18.0