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

Merge upstream. Fixes #173

Browse Source
This commit is contained in:
Jamie Mansfield 2017-09-16 12:47:11 +01:00
parent c676a410b0
commit 29831c0399
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit ef326dba192fe532dc6509e0975266715da5ccea Subproject commit 3db9fb1b6942a4ae8b1e9661404533a5f4982ff9

8
BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
View File

@ -1,4 +1,4 @@
From 8c1a507e084cbf9b0bd023b8a736554406eaa2e5 Mon Sep 17 00:00:00 2001 From f89cb687f56c14d7d49a0bd8bfbb1a62fbcbbadf Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600 Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API Subject: [PATCH] Better unit tests for Chat API
@ -44,10 +44,10 @@ index 0837c672..7d1ee8e7 100644
+ } + }
} }
diff --git a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java diff --git a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java
index c844dab5..8952cbf8 100644 index 3d9396d3..c1afa6da 100644
--- a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java --- a/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java
+++ b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java +++ b/proxy/src/test/java/net/md_5/bungee/chat/ComponentsTest.java
@@ -140,6 +140,26 @@ public class ComponentsTest @@ -149,6 +149,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent ); Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
} }
@ -75,5 +75,5 @@ index c844dab5..8952cbf8 100644
public void testLoopSimple() public void testLoopSimple()
{ {
-- --
2.13.4 2.14.1