Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-16 07:15:14 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream

Browse Source
This commit is contained in:
Jamie Mansfield 2016-08-16 00:47:02 +01:00
parent c369fa9f30
commit d1b744857b
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 3a0b0aa116310add15ef0b2d77be8b76a1564adf
Subproject commit 37b3cb4a30824566cfe5bacbae995957db095a72

12
BungeeCord-Patches/0010-Fix-unicode-characters-in-configuration-files.patch
View File

@ -1,11 +1,11 @@
From 9b2fa052c06b3a6b21d2c30ada5acb488ca3c452 Mon Sep 17 00:00:00 2001
From 2b84f26c4d3b06e90badd6260f35745967817f0e Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files
diff --git a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
index 0a93602..efeaa6a 100644
index db8aa4b..9258d7d 100644
--- a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
+++ b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
@@ -1,16 +1,25 @@
@ -33,8 +33,8 @@ index 0a93602..efeaa6a 100644
+
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
@@ -32,7 +41,7 @@ public class YamlConfiguration extends ConfigurationProvider
import org.yaml.snakeyaml.constructor.Constructor;
@@ -51,7 +60,7 @@ public class YamlConfiguration extends ConfigurationProvider
@Override
public void save(Configuration config, File file) throws IOException
{
@ -43,7 +43,7 @@ index 0a93602..efeaa6a 100644
{
save( config, writer );
}
@@ -53,7 +62,7 @@ public class YamlConfiguration extends ConfigurationProvider
@@ -72,7 +81,7 @@ public class YamlConfiguration extends ConfigurationProvider
@Override
public Configuration load(File file, Configuration defaults) throws IOException
{
@ -53,5 +53,5 @@ index 0a93602..efeaa6a 100644
return load( reader, defaults );
}
--
2.8.3
2.8.2

10
BungeeCord-Patches/0036-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 8942694e72894ba95b161ed3a60407cfe13836e2 Mon Sep 17 00:00:00 2001
From 1a12419d5fe6c6e0736accd2ef9768ddf79245a9 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -126,11 +126,11 @@ index 11c5b68..1c011d0 100644
* Gets the server info of a server.
*
diff --git a/config/src/main/java/net/md_5/bungee/config/Configuration.java b/config/src/main/java/net/md_5/bungee/config/Configuration.java
index 1366f44..05ec159 100644
index 9f3464d..4f359ce 100644
--- a/config/src/main/java/net/md_5/bungee/config/Configuration.java
+++ b/config/src/main/java/net/md_5/bungee/config/Configuration.java
@@ -28,6 +28,13 @@ public final class Configuration
this( new LinkedHashMap<String, Object>(), defaults );
@@ -44,6 +44,13 @@ public final class Configuration
}
}
+ // Waterfall start - Allow configuration objects to be cloned
@ -285,5 +285,5 @@ index db9ebbd..4d16fa3 100644
+ // Waterfall end
}
--
2.7.4 (Apple Git-66)
2.8.2